Yury G. Kudryashov 2bca92e32d Merge trunk ... Conflicts: 1. cmake upgrade: use 2.8.7 2. openssl: left FreeBSD-asm patch. svn path=/nixpkgs/branches/stdenv-updates/; revision=31245		2012-01-03 17:25:24 +00:00
..
cert-file.patch
darwin-arch.patch
default.nix	Merge trunk	2012-01-03 17:25:24 +00:00
freebsd-x86_64-asm.patch	OpenSSL: Fix compilation on x86_64-freebsd.	2011-12-01 10:59:26 +00:00
hurd-target.patch	openssl: Fix target settings when building for GNU/hurd	2011-11-16 19:03:52 +00:00