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
..
builder.sh	* "sed -i" isn't very portable, so don't use it here.	2012-01-19 16:23:14 +00:00
default-builder.sh	* "." -> "source".	2005-12-05 14:11:09 +00:00
default.nix	svn merge ^/nixpkgs/trunk	2012-01-26 15:27:03 +00:00
setup.sh	* Doh.	2012-01-19 22:18:34 +00:00