merge with 3.3

e5640269 · Georg Brandl · 16dd5245 · 0472bc87 · e5640269 · e5640269
Commit e5640269 authored Sep 30, 2012 by Georg Brandl
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Doc/Makefile Doc/Makefile +1 -1

Doc/make.bat Doc/make.bat +1 -1

No files found.
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -53,7 +53,7 @@ checkout:
 	fi
 	@if [ ! -d tools/pygments ]; then \
 	  echo "Checking out Pygments..."; \
-	  svn checkout $(SVNROOT)/external/Pygments-1.3.1/pygments tools/pygments; \
+	  svn checkout $(SVNROOT)/external/Pygments-1.5dev-20120930/pygments tools/pygments; \
 	fi

 update: clean checkout

--- a/Doc/make.bat
+++ b/Doc/make.bat
@@ -37,7 +37,7 @@ goto end
 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.3.1/pygments tools/pygments
+svn co %SVNROOT%/external/Pygments-1.5dev-20120930/pygments tools/pygments
 goto end

 :update