Lluís Batlle i Rossell a3403e6828 Finishing the update from trunk, having resolved the eclipse related directory ... renaming. I think directory renaming breaks the usual merges... because it leaves the 'to be removed' directory in the working directory still. A manual 'rm' of the 'to be removed' directory fixed the commit. svn merge ^/nixpkgs/trunk svn path=/nixpkgs/branches/stdenv-updates/; revision=18661		2009-11-26 21:46:08 +00:00
..
builder.sh	* Allow the user to install stdenv (nix-env -i stdenv) and get all the	2009-04-25 14:08:29 +00:00
default-builder.sh	* "." -> "source".	2005-12-05 14:11:09 +00:00
default.nix	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
docs.txt	* The `patch' command is now part of stdenv, so it no longer needs to	2004-09-18 17:23:18 +00:00
setup.sh	Fixing stdenv's chain of propagated-build-inputs (2nd level propagated build	2009-11-23 19:45:18 +00:00