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

[georg.brandl]

http://hg.python.org/cpython/rev/a388bf1cc827
changeset:   88420:a388bf1cc827
parent:      88417:1638360eea41
parent:      88419:c057e8f067c5
user:        Georg Brandl <georg at python.org>
date:        Sun Jan 12 08:10:52 2014 +0100
summary:
  merge with 3.3

files:
  Doc/make.bat |  8 ++++----
  1 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Doc/make.bat b/Doc/make.bat
--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -34,10 +34,10 @@
 goto end
 
 :checkout
-svn co %SVNROOT%/external/Sphinx-1.0.7/sphinx tools/sphinx
-svn co %SVNROOT%/external/docutils-0.6/docutils tools/docutils
-svn co %SVNROOT%/external/Jinja-2.3.1/jinja2 tools/jinja2
-svn co %SVNROOT%/external/Pygments-1.5dev-20120930/pygments tools/pygments
+svn co %SVNROOT%/external/Sphinx-1.2/sphinx tools/sphinx
+svn co %SVNROOT%/external/docutils-0.11/docutils tools/docutils
+svn co %SVNROOT%/external/Jinja2-2.7.2/jinja2 tools/jinja2
+svn co %SVNROOT%/external/Pygments-1.6/pygments tools/pygments
 goto end
 
 :update

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