diff options
| author | Georg Brandl <georg@python.org> | 2014-01-14 11:27:21 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2014-01-14 11:27:21 (GMT) |
| commit | 738cb60f6529964392ef32c7401bad83076fa4e3 (patch) | |
| tree | bc119defd6e0cf76bdb27c23dc8a26e18eeb6c7e | |
| parent | 60ea92883f87ff7eb18f6eacd354e86c28c8d910 (diff) | |
| parent | 8bd656ddb8d316f51c3093f1e1bb0350e0d3e607 (diff) | |
| download | cpython-738cb60f6529964392ef32c7401bad83076fa4e3.zip cpython-738cb60f6529964392ef32c7401bad83076fa4e3.tar.gz cpython-738cb60f6529964392ef32c7401bad83076fa4e3.tar.bz2 | |
merge with 3.3
| -rw-r--r-- | Doc/Makefile | 2 | ||||
| -rw-r--r-- | Doc/make.bat | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/Makefile b/Doc/Makefile index c131ad7..82f5bef 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -49,7 +49,7 @@ checkout: fi @if [ ! -d tools/jinja2 ]; then \ echo "Checking out Jinja..."; \ - svn checkout $(SVNROOT)/external/Jinja2-2.7.2/jinja2 tools/jinja2; \ + svn checkout $(SVNROOT)/external/Jinja-2.3.1/jinja2 tools/jinja2; \ fi @if [ ! -d tools/pygments ]; then \ echo "Checking out Pygments..."; \ diff --git a/Doc/make.bat b/Doc/make.bat index 4bae679..d6f7074 100644 --- a/Doc/make.bat +++ b/Doc/make.bat @@ -36,7 +36,7 @@ goto end :checkout 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/Jinja-2.3.1/jinja2 tools/jinja2 svn co %SVNROOT%/external/Pygments-1.6/pygments tools/pygments goto end |