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

svn merge ^/nixpkgs/trunk 

svn path=/nixpkgs/branches/stdenv-updates/; revision=32265
parents fc21cca5 19dde94d
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