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

[amaury.forgeotdarc]

http://hg.python.org/cpython/rev/e4410e69d529
changeset:   76275:e4410e69d529
parent:      76268:3df2f4a83816
parent:      76274:178acd78144b
user:        Amaury Forgeot d'Arc <amauryfa at gmail.com>
date:        Fri Apr 13 02:23:59 2012 +0200
summary:
  hg merge 3.2

files:
  PC/VC6/pythoncore.dsp      |  4 ++++
  PC/VS7.1/pythoncore.vcproj |  3 +++
  PC/VS8.0/pythoncore.vcproj |  4 ++++
  3 files changed, 11 insertions(+), 0 deletions(-)


diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -655,6 +655,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Python\random.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\rangeobject.c
 # End Source File
 # Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -767,6 +767,9 @@
 			RelativePath="..\..\Python\pythonrun.c">
 		</File>
 		<File
+			RelativePath="..\..\Python\random.c">
+		</File>
+		<File
 			RelativePath="..\..\Objects\rangeobject.c">
 		</File>
 		<File
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1883,6 +1883,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Python\random.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Python\structmember.c"
 				>
 			</File>

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