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
..
2012-02-10 10:24:30 +00:00
2012-02-10 10:24:30 +00:00
2012-01-18 20:53:01 +00:00
2012-01-27 16:43:39 +00:00
2012-02-10 10:24:30 +00:00
2012-02-06 23:03:12 +00:00
2012-01-26 15:27:03 +00:00
2012-02-06 23:03:12 +00:00
2012-02-10 10:24:30 +00:00
2012-02-10 10:24:30 +00:00
2012-01-18 20:16:00 +00:00
2012-01-26 15:27:03 +00:00
2012-02-10 10:24:30 +00:00
2012-02-10 10:24:30 +00:00