Files
nixpkgs/pkgs/servers
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
..
2009-03-22 15:32:28 +00:00
2009-11-18 12:47:58 +00:00
2009-06-01 00:03:08 +00:00
2009-11-16 12:50:04 +00:00
2009-05-09 15:37:50 +00:00
2008-08-07 15:05:52 +00:00
2009-03-08 12:29:34 +00:00
2009-08-19 20:19:17 +00:00