nixpkgs/pkgs/os-specific
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
..
darwin pkgs/development/interpreters/python/2.6/default.nix: fixed build on Darwin 2009-11-05 13:44:30 +00:00
linux Finishing the update from trunk, having resolved the eclipse related directory 2009-11-26 21:46:08 +00:00