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
..
beep	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
cups	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
drivers	Fix broken use of builtins.currentSystem	2014-07-28 11:28:35 +02:00
emulators	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
foldingathome	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
freestyle	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
ghostscript	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gxemul
jackaudio	Revert "Remove obsolete jackaudio version 1."	2014-07-31 12:52:29 +02:00
lilypond
maven	maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253	2014-07-04 21:45:30 +04:00
my-env	my-env: Support for running command directly by load-env-xxx script	2014-07-16 23:09:49 +02:00
screensavers	xscreensaver: update from 5.26 to 5.29	2014-07-11 11:37:47 -04:00
seafile-shared
solfege
source-and-tags
themes
uboot
vim-plugins	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
xosd
misc.nix