Skip to content
Commit 38e3d7bc authored by Yury G. Kudryashov's avatar Yury G. Kudryashov
Browse files

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
parents 79232c5f 65e7aeda
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment