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
..
applications	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
build-support	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
configs/etc
data	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
desktops	Adding filelight for kde4.	2009-11-23 21:15:11 +00:00
development	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
games	Updating supertuxkart.	2009-11-23 23:12:27 +00:00
lib	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
misc	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
os-specific	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
servers	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
shells	Fixing some things on the gcc-cross-wrapper (libc was not properly added to the	2009-11-20 22:56:58 +00:00
stdenv	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
test
tools	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
top-level	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00