Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
bootstrap	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
scripts
default.nix	Merge stdenv-updates-gcc47 into stdenv-updates	2013-03-09 12:01:39 +01:00
make-bootstrap-tools-crosspi.nix
make-bootstrap-tools.nix