merge with main repo 3.2 branch

This commit is contained in:
Georg Brandl 2013-03-25 06:56:31 +01:00
commit 4eb5f1a567
10 changed files with 62 additions and 27 deletions

View file

@ -153,9 +153,9 @@ _ssl
Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as
dist/openssl-1.0.0j
dist/openssl-1.0.0k
You need to use version 1.0.0j of OpenSSL.
You need to use version 1.0.0k of OpenSSL.
You can install the NASM assembler from
http://www.nasm.us/

View file

@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.0j"
Value="$(externalsDir)\openssl-1.0.0k"
/>
<UserMacro
Name="tcltkDir"