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-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-02-10 10:24:30 +00:00
2012-01-18 20:16:00 +00:00
2012-01-19 21:31:51 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2012-01-20 16:42:16 +00:00
2012-01-18 20:16:00 +00:00
2012-01-18 20:16:00 +00:00
2011-12-05 09:38:59 +00:00
2012-01-18 20:16:00 +00:00
2012-02-02 22:41:21 +00:00
2012-02-10 05:22:58 +00:00
2012-01-18 20:16:00 +00:00