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

Merge trunk 

Conflicts:
1. cmake upgrade: use 2.8.7
2. openssl: left FreeBSD-asm patch.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31245
parents 08761e83 71c6de73
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