nixpkgs/pkgs/applications
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 * Idem for gtk-libs/2.16. 2009-10-28 15:31:52 +00:00
display-managers/slim * slim: ConsoleKit compatibility fix. 2009-08-17 01:09:17 +00:00
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 Preliminary version of package ssreflect 2009-11-05 15:08:12 +00:00
taxes * Got rid of a lot of "postInstall=postInstall" and similar lines in 2009-04-23 13:31:10 +00:00
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 Updated xmonad to 0.9. 2009-11-06 13:08:47 +00:00