hg merge 3.2

amauryfa · amauryfa · commit 8963943fc39f · 2012-04-13T02:23:59.000+02:00
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
@@ -766,6 +766,9 @@
 		<File
 			RelativePath="..\..\Python\pythonrun.c">
 		</File>
+		<File
+			RelativePath="..\..\Python\random.c">
+		</File>
 		<File
 			RelativePath="..\..\Objects\rangeobject.c">
 		</File>
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
@@ -1882,6 +1882,10 @@
 				RelativePath="..\..\Python\pythonrun.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\Python\random.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Python\structmember.c"
 				>

Original file line number	Diff line number	Diff line change
`@@ -1882,6 +1882,10 @@`
`1882`	`1882`	`RelativePath="..\..\Python\pythonrun.c"`
`1883`	`1883`	`>`
`1884`	`1884`	`</File>`
	`1885`	`+ <File`
	`1886`	`+ RelativePath="..\..\Python\random.c"`
	`1887`	`+ >`
	`1888`	`+ </File>`
`1885`	`1889`	`<File`
`1886`	`1890`	`RelativePath="..\..\Python\structmember.c"`
`1887`	`1891`	`>`