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
..
generic	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
linux	stdenv-linux: Turn allowedRequisites back on	2014-10-06 22:11:05 +02:00
native
nix	Prevent an unnecessary evaluation of lib	2014-08-09 12:45:18 +02:00
adapters.nix	stdenv-linux: Turn allowedRequisites back on	2014-10-06 22:11:05 +02:00
common-path.nix
default.nix	Prevent an unnecessary evaluation of lib	2014-08-09 12:45:18 +02:00