merge with 3.4

This commit is contained in:
Georg Brandl 2014-09-30 22:24:08 +02:00
commit c8da4287a7

View file

@ -6,7 +6,6 @@
# You can set these variables from the command line. # You can set these variables from the command line.
PYTHON = python PYTHON = python
SPHINXBUILD = sphinx-build SPHINXBUILD = sphinx-build
SPHINXOPTS =
PAPER = PAPER =
SOURCES = SOURCES =
DISTVERSION = $(shell $(PYTHON) tools/sphinxext/patchlevel.py) DISTVERSION = $(shell $(PYTHON) tools/sphinxext/patchlevel.py)