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

georg.brandl python-checkins at python.org
Tue Sep 30 22:24:16 CEST 2014


https://hg.python.org/cpython/rev/457683a973f3
changeset: 92686:457683a973f3
parent: 92684:50d64b5d98ad
parent: 92685:860c50e40720
user: Georg Brandl <georg at python.org>
date: Tue Sep 30 22:24:08 2014 +0200
summary:
 merge with 3.4
files:
 Doc/Makefile | 1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Doc/Makefile b/Doc/Makefile
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -6,7 +6,6 @@
 # You can set these variables from the command line.
 PYTHON = python
 SPHINXBUILD = sphinx-build
-SPHINXOPTS =
 PAPER =
 SOURCES =
 DISTVERSION = $(shell $(PYTHON) tools/sphinxext/patchlevel.py)
-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list

AltStyle によって変換されたページ (->オリジナル) /