Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
admin	sec: update to version 2.7.6	2014-07-30 16:11:52 +02:00
archivers	Update ZPAQ	2014-08-03 22:29:41 +04:00
audio	mpdcron: add expression	2014-05-23 08:39:28 +10:00
backup	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
bluetooth	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
cd-dvd	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
compression	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
filesystems	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
graphics	pngcrush: update from 1.7.73 to 1.7.76	2014-08-04 15:56:11 +02:00
inputmethods/fcitx	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
misc	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
networking	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
package-management	nixUnstable: Update to 1.8pre3718_51485dc	2014-08-04 14:00:41 +02:00
security	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
system	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
text	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
typesetting	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
video	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
virtualization	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
X11	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00