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

Tue Sep 23 22:26:02 CEST 2014

https://hg.python.org/cpython/rev/01efc4157f63
changeset: 92552:01efc4157f63
parent: 92550:3b32f495fb38
parent: 92547:9c9980c3c38c
user: Serhiy Storchaka <storchaka at gmail.com>
date: Tue Sep 23 23:23:55 2014 +0300
summary:
 Merge heads
files:
 Mac/PythonLauncher/Makefile.in | 1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/Mac/PythonLauncher/Makefile.in b/Mac/PythonLauncher/Makefile.in
--- a/Mac/PythonLauncher/Makefile.in
+++ b/Mac/PythonLauncher/Makefile.in
@@ -50,7 +50,6 @@
 	cp $(srcdir)/../Icons/PythonCompiled.icns "Python Launcher.app/Contents/Resources"
 	cp $(srcdir)/factorySettings.plist "Python Launcher.app/Contents/Resources"
 	cp -R $(srcdir)/English.lproj "Python Launcher.app/Contents/Resources"
-	find "Python Launcher.app" -name '.svn' -print0 | xargs -0 rm -r
 
 FileSettings.o: $(srcdir)/FileSettings.m
 	$(CC) $(CFLAGS) -o $@ -c $(srcdir)/FileSettings.m
-- 
Repository URL: https://hg.python.org/cpython
