Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
bash-4.2-patches.nix	bash: Update to 4.2p53	2014-10-06 20:20:04 +02:00
default.nix	Updated bash to patch 50.	2014-09-29 13:44:38 +02:00
update-patch-set.sh	pkgs/shells/bash: updated "interactive" bash to version 4.2	2011-09-28 14:37:03 +00:00