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
..
2.24.x.nix	* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.	2012-01-18 20:53:01 +00:00
3.2.x.nix	svn merge ^/nixpkgs/trunk	2012-02-10 10:24:30 +00:00
old-icons.patch