summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2013-05-12 17:57:26 (GMT)
committerGeorg Brandl <georg@python.org>2013-05-12 17:57:26 (GMT)
commit3bfc5f5d833f081089e181cadf52d4ec50e62d13 (patch)
treea5c65c3507e46185a65126c4c5399494ee14d8d6 /PCbuild
parent3068aed92bb7557cdef7e18a4a02ddff2dc1ad0b (diff)
parent0ab18e4f4b93649031911099c6b2387a5098fd0e (diff)
downloadcpython-3bfc5f5d833f081089e181cadf52d4ec50e62d13.zip
cpython-3bfc5f5d833f081089e181cadf52d4ec50e62d13.tar.gz
cpython-3bfc5f5d833f081089e181cadf52d4ec50e62d13.tar.bz2
merge with 3.3
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/pyproject.props2
-rw-r--r--PCbuild/readme.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props
index 64008c6..6be0ba2 100644
--- a/PCbuild/pyproject.props
+++ b/PCbuild/pyproject.props
@@ -20,7 +20,7 @@
<sqlite3Dir>$(externalsDir)\sqlite-3.7.12</sqlite3Dir>
<bz2Dir>$(externalsDir)\bzip2-1.0.6</bz2Dir>
<lzmaDir>$(externalsDir)\xz-5.0.3</lzmaDir>
- <opensslDir>$(externalsDir)\openssl-1.0.1d</opensslDir>
+ <opensslDir>$(externalsDir)\openssl-1.0.1e</opensslDir>
<tcltkDir>$(externalsDir)\tcltk</tcltkDir>
<tcltk64Dir>$(externalsDir)\tcltk64</tcltk64Dir>
<tcltkLib>$(tcltkDir)\lib\tcl85.lib;$(tcltkDir)\lib\tk85.lib</tcltkLib>
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 8dd3eee..b60f22d 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -142,7 +142,7 @@ _ssl
Get the source code through
- svn export http://svn.python.org/projects/external/openssl-1.0.1d
+ svn export http://svn.python.org/projects/external/openssl-1.0.1e
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source