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
..
audio	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
graphics	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +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
office	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
science	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
video	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
virtualization	Remove broken flag for xen, build with gcc45.	2014-08-01 17:18:27 +02:00
window-managers	Update compiz	2014-08-03 22:29:40 +04:00