summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-03-25 05:56:31 (GMT)
committerGeorg Brandl <georg@python.org>2013-03-25 05:56:31 (GMT)
commit4eb5f1a56702399ea3bc4553433e7ca9b37be18c (patch)
treee1152dda05deaccc514046ebb50b45e94f341a90 /PC
parenta7d2f0061f2ddcce875b5c56b1f807ed3b6cd2cb (diff)
parent5be6d74a0d0ae111cd823d2b7a5896c77d8c8895 (diff)
downloadcpython-4eb5f1a56702399ea3bc4553433e7ca9b37be18c.zip
cpython-4eb5f1a56702399ea3bc4553433e7ca9b37be18c.tar.gz
cpython-4eb5f1a56702399ea3bc4553433e7ca9b37be18c.tar.bz2
merge with main repo 3.2 branchv3.2.4rc1
Diffstat (limited to 'PC')
-rw-r--r--PC/VC6/readme.txt4
-rw-r--r--PC/VS8.0/pyproject.vsprops2
2 files changed, 3 insertions, 3 deletions
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index fa1ae7d..d93760d 100644
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -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/
diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops
index 2a82e49..b75b2c6 100644
--- a/PC/VS8.0/pyproject.vsprops
+++ b/PC/VS8.0/pyproject.vsprops
@@ -58,7 +58,7 @@
/>
<UserMacro
Name="opensslDir"
- Value="$(externalsDir)\openssl-1.0.0j"
+ Value="$(externalsDir)\openssl-1.0.0k"
/>
<UserMacro
Name="tcltkDir"