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

[martin.v.loewis]

http://hg.python.org/cpython/rev/412e33fb716f
changeset:   77640:412e33fb716f
parent:      77638:979567d33376
parent:      77639:b6efb4c2995b
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sat Jun 23 19:51:48 2012 +0200
summary:
  Merge with 3.2

files:
  PC/python3.mak |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/PC/python3.mak b/PC/python3.mak
--- a/PC/python3.mak
+++ b/PC/python3.mak
@@ -1,4 +1,4 @@
-$(OutDir)python33.dll:	python3.def $(OutDir)python33stub.lib
+$(OutDir)python3.dll:	python3.def $(OutDir)python32stub.lib
 	cl /LD /Fe$(OutDir)python3.dll python3dll.c python3.def $(OutDir)python33stub.lib
 
 $(OutDir)python33stub.lib:	python33stub.def
@@ -7,4 +7,4 @@
 clean:
 	del $(OutDir)python3.dll $(OutDir)python3.lib $(OutDir)python33stub.lib $(OutDir)python3.exp $(OutDir)python33stub.exp
 
-rebuild: clean $(OutDir)python33.dll
+rebuild: clean $(OutDir)python3.dll

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