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

Wed Dec 10 17:05:42 CET 2014

https://hg.python.org/cpython/rev/bf98400daa62
changeset: 93815:bf98400daa62
parent: 93805:1a1f577ca647
parent: 93814:957117d642f3
user: Benjamin Peterson <benjamin at python.org>
date: Wed Dec 10 11:05:35 2014 -0500
summary:
 merge 3.4
files:
 Doc/Makefile | 2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -8,7 +8,7 @@
 SPHINXBUILD = sphinx-build
 PAPER =
 SOURCES =
-DISTVERSION = $(shell $(PYTHON) tools/patchlevel.py)
+DISTVERSION = $(shell $(PYTHON) tools/extensions/patchlevel.py)
 
 ALLSPHINXOPTS = -b $(BUILDER) -d build/doctrees -D latex_paper_size=$(PAPER) \
 $(SPHINXOPTS) . build/$(BUILDER) $(SOURCES)
-- 
Repository URL: https://hg.python.org/cpython
