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
2011-08-20 06:39:29 +00:00
2011-08-20 06:39:29 +00:00
2011-08-20 06:39:29 +00:00
2012-01-18 20:16:00 +00:00
2012-01-21 00:34:51 +00:00
2012-02-17 22:31:37 +00:00
2012-02-17 22:31:37 +00:00
2011-11-29 14:19:35 +00:00
2011-08-09 20:04:03 +00:00
2012-02-22 12:12:00 +00:00
2012-02-22 12:12:00 +00:00
2012-02-22 12:12:00 +00:00
2012-02-23 18:07:09 +00:00
2012-02-23 20:06:21 +00:00
2012-01-06 19:35:12 +00:00
38e3d7bc86