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
..
bash-4.2-patches.nix	bash: Update to 4.2-p47	2014-06-24 13:53:59 +02:00
default.nix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
update-patch-set.sh	pkgs/shells/bash: updated "interactive" bash to version 4.2	2011-09-28 14:37:03 +00:00