Skip to content
Commit 9ee0a9df authored by Yury G. Kudryashov's avatar Yury G. Kudryashov
Browse files

svn merge ^/nixpkgs/trunk 

A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
parents 0b90cd41 47288a22
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