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
..
builder.sh
default-builder.sh
default.nix	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
setup.sh	Revert "stdenv/setup.sh: unbreak *.lz sources on darwin"	2014-08-30 22:41:56 +02:00