5144a19987
There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174 |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
COPYING | ||
default.nix | ||
STABLE | ||
TODO.txt | ||
VERSION |
5144a19987
There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174 |
||
---|---|---|
doc | ||
maintainers | ||
pkgs | ||
COPYING | ||
default.nix | ||
STABLE | ||
TODO.txt | ||
VERSION |