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
..
2012-01-03 17:25:24 +00:00
2012-01-02 14:12:40 +00:00
2011-12-15 20:16:46 +00:00
2012-01-02 12:54:22 +00:00
2012-01-03 17:25:24 +00:00
2012-01-03 17:25:24 +00:00
2011-12-12 16:54:35 +00:00
2012-01-02 14:12:40 +00:00
2012-01-03 17:25:24 +00:00
2011-12-31 15:37:51 +00:00
2012-01-02 14:12:40 +00:00
2011-12-20 10:32:14 +00:00
2012-01-03 17:25:24 +00:00
2012-01-03 17:25:24 +00:00