Silly nixpkgs mirror, totally harmless :3
Find a file
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
doc * Package naming / versioning guidelines. 2009-11-18 15:05:09 +00:00
maintainers * Add a script to retrieve licenses of the current derivation and of all 2009-11-21 17:50:00 +00:00
pkgs Finishing the update from trunk, having resolved the eclipse related directory 2009-11-26 21:46:08 +00:00
COPYING
default.nix * For convenience, provide a top-level Nix expression that simply 2007-04-26 14:32:57 +00:00
STABLE
VERSION * Bumped the version number. 2009-04-24 21:59:56 +00:00