Yury G. Kudryashov 38e3d7bc86
svn merge ^/nixpkgs/trunk ...
Not merged r32497 (tree conflict, glibc GNU Hurd update). Ludovic, could you
please look at this?
svn path=/nixpkgs/branches/stdenv-updates/; revision=32520
2012-02-23 20:06:21 +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-20 05:30:06 +00:00
2011-11-10 22:50:45 +00:00
2012-01-18 20:16:00 +00:00
2012-02-21 23:29:21 +00:00
2011-12-05 01:32:25 +00:00
2012-02-03 13:12:07 +00:00
2011-10-13 12:37:15 +00:00
2012-01-18 20:16:00 +00:00
2011-11-08 21:07:57 +00:00
2012-01-18 20:53:01 +00:00
2012-02-23 00:01:24 +00:00
2012-01-18 20:52:26 +00:00
2012-02-23 20:06:21 +00:00
2011-08-30 07:02:01 +00:00
2012-02-06 23:03:12 +00:00
2011-12-13 12:43:11 +00:00
2012-01-26 15:27:03 +00:00
38e3d7bc86