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
..
admin
archivers
backup
bluetooth
cd-dvd
compression
graphics
misc	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
networking	Finishing the update from trunk, having resolved the eclipse related directory	2009-11-26 21:46:08 +00:00
package-management	* Nix updated to nix-0.14pre18592.	2009-11-24 14:19:20 +00:00
pydb
security	Fix the cleanup-induced problems	2009-11-23 12:21:34 +00:00
system	Fixing the filelight 1.0 expression (kde3), so it builds again.	2009-11-23 21:15:15 +00:00
text
typesetting
video
virtualization/amazon-ec2-api-tools
X11	Update xlaunch to match NixOS update	2009-11-26 20:17:20 +00:00