Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
admin	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
archivers	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
audio	Fixed many descriptions	2014-11-11 14:36:34 +01:00
backup	bareos: Add derivation	2014-11-04 11:11:14 -08:00
bluetooth
cd-dvd
compression	Merge remote-tracking branch 'origin/master' into staging	2014-11-06 10:16:39 +01:00
filesystems	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
graphics	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
inputmethods	Add anthy support to uim	2014-11-07 11:17:48 +02:00
misc	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
networking	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
package-management	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
security	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
text	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
typesetting	Merge branch 'master' into staging	2014-11-10 10:03:52 +01:00
video
virtualization	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
X11	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00