Yury G. Kudryashov 5144a19987 svn merge ^/nixpkgs/trunk ... There were a few merge conflicts due to ensureDir->mkdir -p migration svn path=/nixpkgs/branches/stdenv-updates/; revision=32174		2012-02-10 10:24:30 +00:00
..
1.28.x.nix
1.29.x.nix	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00