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

merge trunk 

A few conflicts due to renames

svn path=/nixpkgs/branches/stdenv-updates/; revision=30947
parents b077940b 1e74801d
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