Yury G. Kudryashov 5b132f6e96 svn merge ^/nixpkgs/trunk ... Conflicts: cups, all-packages.nix (gcc45_debug) svn path=/nixpkgs/branches/stdenv-updates/; revision=31863		2012-01-26 15:27:03 +00:00
..
bootstrap	Updating the reference to the i686-linux bootstrap-tools, so it takes the	2010-10-29 12:41:50 +00:00
scripts	* Prepend the "prehook" rather than sourcing it.	2012-01-19 15:56:17 +00:00
default.nix	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
make-bootstrap-tools.nix	* Don't use the "replace-literal" command in stdenv; instead use	2012-01-19 13:47:26 +00:00