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
..
darwin
gnu	Add SMBFS for GNU/Hurd.	2012-02-23 00:01:29 +00:00
linux	svn merge ^/nixpkgs/trunk	2012-02-23 20:06:21 +00:00
windows	svn merge ^/nixpkgs/trunk	2012-02-06 23:03:12 +00:00