3 Commits

Author	SHA1	Message	Date
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
Bjørn Forsman	25e726b283	pypy: fix copy-paste error in setup-hook ... Introduced in 428fdc879f ("pypy: 2.3 -> 2.4").	2014-09-26 20:10:06 +02:00
Domen Kožar	428fdc879f	pypy: 2.3 -> 2.4	2014-09-26 18:12:24 +02:00