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	Remove broken platforms	2009-08-26 12:05:28 +00:00
archivers	* Removed selectVersion. There's no good reason to write	2009-11-18 09:39:59 +00:00
backup
bluetooth	* Added obexd.	2009-09-29 12:54:08 +00:00
cd-dvd	Fixing cdrdao, getting also mp3 and ogg support in it.	2009-10-26 23:03:47 +00:00
compression	Porting changes from stdenv-updates into this branch.	2009-11-08 00:32:12 +00:00
graphics	GNU Plotutils: cosmetic changes; adding myself as co-maintainer.	2009-11-06 22:44:13 +00:00
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	Merging from trunk. I had to do two manual merges, quite trivial I think.	2009-11-19 19:09:10 +00:00
typesetting	pkgs/tools/typesetting/asciidoc: updated to version 8.5.1	2009-11-03 15:57:22 +00:00
video	Adding vncrec - a VNC recorder	2009-08-07 12:00:00 +00:00
virtualization/amazon-ec2-api-tools	amazon ec2 api tools	2009-10-27 12:48:26 +00:00
X11	Update xlaunch to match NixOS update	2009-11-26 20:17:20 +00:00