Eelco Dolstra 06fc1ec34d Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/servers/serfdom/default.nix		2014-07-01 11:25:41 +02:00
..
admin	Add missing dependency to gtk-vnc	2014-06-19 18:23:14 +04:00
archivers	zip: add meta.description	2014-06-23 13:35:08 +02:00
audio
backup	Another attempt to eradicate ensureDir	2014-06-30 14:56:10 +02:00
bluetooth
cd-dvd
compression
filesystems	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
graphics	Update povray.	2014-06-26 11:31:59 +02:00
inputmethods/fcitx
misc	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
networking	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
package-management	cabal-install: update to version 1.20.0.3	2014-06-30 17:03:07 +02:00
security	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
text	diffstat: weaken platform requirement	2014-06-24 14:45:33 -07:00
typesetting	Merge remote-tracking branch 'origin/master' into staging	2014-07-01 11:25:41 +02:00
video
virtualization
X11	Change to xpra version 0.11.6 as 0.12.5 was not working	2014-06-16 12:12:46 +12:00