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
..
compilers	Merging from trunk, partially, to get rid of the annoying failing commits from	2009-11-26 21:34:53 +00:00
eclipse	ECJ 3.5.1.	2009-11-05 14:36:45 +00:00
guile-modules	Add GNU guile-gnome.	2009-10-05 22:21:50 +00:00
interpreters	Merging from trunk, partially, to get rid of the annoying failing commits from	2009-11-26 21:34:53 +00:00
libraries	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
misc	hg2git has been put into repo fast-export. make it work again	2009-10-27 17:46:37 +00:00
perl-modules	Making perl DB_File follow the lib/perl5/site_perl convention for the *.pm files,	2009-10-15 22:08:23 +00:00
python-modules	Fix the cleanup-induced problems	2009-11-23 12:21:34 +00:00
ruby-modules	Two Ruby modules	2008-10-05 09:00:56 +00:00
tools	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00