Peter Simons 26faa326cd hackage-packages.nix: re-generate from Hackage 2015-02-13T12:48:35+0100		2015-02-13 22:24:32 +01:00
..
applications	Merge remote-tracking branch 'origin/master' into staging.	2015-02-13 22:13:25 +01:00
build-support	Fix conflict between fedora-release and generic-release	2015-02-12 17:55:29 +01:00
data	symbola: update to 7.19 ; fixes wrong hash.	2015-02-08 20:26:59 +01:00
desktops	gnome3: Set XCURSOR_PATH. Closes #6191	2015-02-11 11:48:51 +00:00
development	hackage-packages.nix: re-generate from Hackage 2015-02-13T12:48:35+0100	2015-02-13 22:24:32 +01:00
games	instead: update from 2.2.1 to 2.2.2	2015-02-07 12:47:42 +01:00
misc	Use XDG_ICON_DIRS in cdemu's XDG_DATA_DIRS	2015-02-10 14:44:29 +01:00
os-specific	Merge remote-tracking branch 'origin/master' into staging.	2015-02-13 22:13:25 +01:00
servers	Merge pull request #6325 from k0ral/opensmtpd	2015-02-13 13:28:04 +00:00
shells	Merge pull request #6319 from sorokin/master	2015-02-12 20:33:21 +01:00
stdenv	I add back the arm unpack script	2015-02-09 22:36:10 +01:00
test	Merge recent master into staging	2014-09-13 21:48:29 +02:00
tools	Merge remote-tracking branch 'origin/master' into staging.	2015-02-13 22:13:25 +01:00
top-level	Merge remote-tracking branch 'origin/master' into staging.	2015-02-13 22:13:25 +01:00