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
..
audio
display-managers/slim
editors	* Bring back Emacs 22 by request from Ludovic.	2009-11-22 16:29:15 +00:00
graphics	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
misc	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
networking	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
office	Add package ledger	2009-11-10 11:02:45 +00:00
science
taxes
version-management	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
video	Enabling plugins in avidemux.	2009-11-24 14:01:48 +00:00
virtualization	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
window-managers