Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
admin	sec: add version 2.7.5	2014-07-12 13:19:08 +02:00
archivers	zip: add meta.description	2014-06-23 13:35:08 +02:00
audio
backup	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +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-22 11:00:00 +02:00
networking	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
package-management	nixUnstable: Update to 1.8pre3679_f609eec	2014-07-18 00:22:08 +02:00
security	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
text	gawk: Remove unnecessary ‘gawk-<version>’ copy	2014-07-08 15:43:05 +02:00
typesetting	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
video
virtualization
X11	bgs: update from 0.5 to 0.6	2014-07-15 19:50:29 +02:00