summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2014-05-01 13:18:43 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2014-05-01 13:18:43 (GMT)
commitb9e71d4a55f968cd713bebe417e9fa4ba1ec12eb (patch)
treeed9c6299a17aa389fabeb88f3fa7116428d3fab9 /Tools
parent161d695fb0455ce52530d4f43a9eac4c738f64bb (diff)
parent3d5c9e2c6710ad9bd93651494b95c6fb1f81da89 (diff)
downloadcpython-b9e71d4a55f968cd713bebe417e9fa4ba1ec12eb.zip
cpython-b9e71d4a55f968cd713bebe417e9fa4ba1ec12eb.tar.gz
cpython-b9e71d4a55f968cd713bebe417e9fa4ba1ec12eb.tar.bz2
Merge with 3.4
Diffstat (limited to 'Tools')
-rw-r--r--Tools/buildbot/external-common.bat8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index 672357c..48004a7 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -14,7 +14,7 @@ cd ..
@rem if exist tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20
-@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1e
+@rem if exist openssl-1.0.1e rd /s/q openssl-1.0.1g
@rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12
@rem bzip
@@ -24,9 +24,9 @@ if not exist bzip2-1.0.6 (
)
@rem OpenSSL
-if not exist openssl-1.0.1e (
- rd /s/q openssl-1.0.1d
- svn export http://svn.python.org/projects/external/openssl-1.0.1e
+if not exist openssl-1.0.1g (
+ rd /s/q openssl-1.0.1e
+ svn export http://svn.python.org/projects/external/openssl-1.0.1g
)
@rem tcl/tk/tix