nixpkgs/pkgs/development/libraries/openssl
Yury G. Kudryashov 9ee0a9df9b svn merge ^/nixpkgs/trunk
A few trivial conflicts

svn path=/nixpkgs/branches/stdenv-updates/; revision=31434
2012-01-08 16:01:12 +00:00
..
cert-file-path-max.patch OpenSSL: Fix compilation on GNU/Hurd. 2012-01-05 23:46:17 +00:00
cert-file.patch
darwin-arch.patch
default.nix svn merge ^/nixpkgs/trunk 2012-01-08 16:01:12 +00:00
freebsd-x86_64-asm.patch OpenSSL: Fix compilation on x86_64-freebsd. 2011-12-01 10:59:26 +00:00
gnu.patch OpenSSL: Further fix `Configure' for GNU builds. 2012-01-06 14:07:02 +00:00
hurd-target.patch