Vladimír Čunát b9045a7d96 Merge branch 'x-updates' into staging ... ...in preparation for a merge to master		2014-07-22 22:28:39 +02:00
..
audio	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +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-07-22 11:00:00 +02:00
graphics	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
inferno	Add inferno, a distributed cross-platform hosted OS	2014-07-02 14:00:49 +12:00
misc	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
networking	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
office	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
science	Don't use ensureDir	2014-07-22 11:01:32 +02:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
video	Merge branch 'x-updates' into staging	2014-07-22 22:28:39 +02:00
virtualization	qemu: 1.7.1 -> 2.0.0	2014-05-18 15:52:44 -05:00
window-managers	Merge recent master into x-updates	2014-07-17 19:30:56 +02:00