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

[martin.v.loewis]

http://hg.python.org/cpython/rev/d1f7fe885060
changeset:   85928:d1f7fe885060
parent:      85926:0474813e9df9
parent:      85927:6237908470fb
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Wed Oct 02 16:59:41 2013 +0200
summary:
  Merge 3.3

files:
  Makefile.pre.in |  3 ---
  1 files changed, 0 insertions(+), 3 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -941,9 +941,6 @@
 		fi
 		$(TESTRUNNER) -j 1 -u all -W --timeout=$(TESTTIMEOUT) $(TESTOPTS)
 
-# Like touch, but also working on 2.7 (where the target is a no-op)
-buildbottouch:	touch
-
 QUICKTESTOPTS=	$(TESTOPTS) -x test_subprocess test_io test_lib2to3 \
 		test_multibytecodec test_urllib2_localnet test_itertools \
 		test_multiprocessing_fork test_multiprocessing_spawn \

-- 
Repository URL: http://hg.python.org/cpython