[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

[zach.ware]

http://hg.python.org/cpython/rev/1a5dbc902daa
changeset:   91096:1a5dbc902daa
parent:      91093:cd688d7a6c59
parent:      91094:31dbdd7596aa
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Sun Jun 08 14:43:08 2014 -0500
summary:
  Merge with 3.4

files:
  Tools/buildbot/external-common.bat |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -9,6 +9,7 @@
 @rem if exist tcltk64 rd /s/q tcltk64
 @rem if exist tcl-8.6.1.0 rd /s/q tcl-8.6.1.0
 @rem if exist tk-8.6.1.0 rd /s/q tk-8.6.1.0
+ at rem if exist tix-8.4.3.4 rd /s/q tix-8.4.3.4
 @rem if exist db-4.4.20 rd /s/q db-4.4.20
 @rem if exist openssl-1.0.1h rd /s/q openssl-1.0.1h
 @rem if exist sqlite-3.7.12 rd /s/q sqlite-3.7.12

-- 
Repository URL: http://hg.python.org/cpython