[Python-checkins] python/dist/src/PCbuild pythoncore.vcproj, 1.30, 1.31

[mhammond@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/PCbuild
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27016

Modified Files:
	pythoncore.vcproj 
Log Message:
Remove conflict markers and add parsermodule.c to get things building


Index: pythoncore.vcproj
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pythoncore.vcproj,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- pythoncore.vcproj	20 Oct 2005 19:59:24 -0000	1.30
+++ pythoncore.vcproj	23 Oct 2005 10:50:04 -0000	1.31
@@ -815,6 +815,9 @@
 			RelativePath="..\Modules\collectionsmodule.c">
 		</File>
 		<File
+			RelativePath="..\Python\compile.c">
+		</File>
+		<File
 			RelativePath="..\Objects\complexobject.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2318,9 +2321,6 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Python\compile.c">
-		</File>
-		<File
 			RelativePath="..\Parser\node.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2456,6 +2456,9 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\Modules\parsermodule.c">
+		</File>
+		<File
 			RelativePath="..\Parser\parsetok.c">
 			<FileConfiguration
 				Name="Release|Win32">
@@ -2759,7 +2762,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\shamodule.c">
+			RelativePath="..\Modules\sha256module.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2786,8 +2789,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-<<<<<<< pythoncore.vcproj
-                        RelativePath="..\Modules\sha256module.c">
+			RelativePath="..\Modules\sha512module.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2814,7 +2816,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-                        RelativePath="..\Modules\sha512module.c">
+			RelativePath="..\Modules\sha512module.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2841,10 +2843,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-			RelativePath="..\Modules\signalmodule.c">
-=======
-                        RelativePath="..\Modules\sha256module.c">
->>>>>>> 1.26.2.3
+			RelativePath="..\Modules\shamodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool
@@ -2871,7 +2870,7 @@
 			</FileConfiguration>
 		</File>
 		<File
-                        RelativePath="..\Modules\sha512module.c">
+			RelativePath="..\Modules\signalmodule.c">
 			<FileConfiguration
 				Name="Release|Win32">
 				<Tool