Fixed svn merge issues

PCbuild/pyproject.vsprops

@@ -38,7 +38,7 @@
 	/>
 	<UserMacro
 		Name="PyDllName"
-		Value="python26"
+		Value="python30"
 	/>
 	<UserMacro
 		Name="PythonExe"

PCbuild/pythoncore.vcproj

@@ -651,7 +651,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Include\bufferobject.h"
+				RelativePath="..\Include\bytes_methods.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\bytesobject.h"
 				>
 			</File>
 			<File
@@ -722,6 +726,10 @@
 				RelativePath="..\Include\floatobject.h"
 				>
 			</File>
+			<File
+				RelativePath="..\Include\formatter_unicode.h"
+				>
+			</File>
 			<File
 				RelativePath="..\Include\frameobject.h"
 				>
@@ -979,15 +987,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_functoolsmodule.c"
+				RelativePath="..\Modules\_fileio.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_heapqmodule.c"
+				RelativePath="..\Modules\_functoolsmodule.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_hotshot.c"
+				RelativePath="..\Modules\_heapqmodule.c"
 				>
 			</File>
 			<File
@@ -1023,19 +1031,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\audioop.c"
+				RelativePath="..\Modules\atexitmodule.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\binascii.c"
+				RelativePath="..\Modules\audioop.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\cmathmodule.c"
+				RelativePath="..\Modules\binascii.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\cPickle.c"
+				RelativePath="..\Modules\cmathmodule.c"
 				>
 			</File>
 			<File
@@ -1054,10 +1062,6 @@
 				RelativePath="..\Modules\gcmodule.c"
 				>
 			</File>
-			<File
-				RelativePath="..\Modules\imageop.c"
-				>
-			</File>
 			<File
 				RelativePath="..\Modules\itertoolsmodule.c"
 				>
@@ -1070,14 +1074,6 @@
 				RelativePath="..\Modules\mathmodule.c"
 				>
 			</File>
-			<File
-				RelativePath="..\Modules\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\Modules\md5.h"
-				>
-			</File>
 			<File
 				RelativePath="..\Modules\md5module.c"
 				>
@@ -1107,25 +1103,21 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\sha256module.c"
+				RelativePath="..\Modules\sha1module.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\sha512module.c"
+				RelativePath="..\Modules\sha256module.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\shamodule.c"
+				RelativePath="..\Modules\sha512module.c"
 				>
 			</File>
 			<File
 				RelativePath="..\Modules\signalmodule.c"
 				>
 			</File>
-			<File
-				RelativePath="..\Modules\stropmodule.c"
-				>
-			</File>
 			<File
 				RelativePath="..\Modules\symtablemodule.c"
 				>
@@ -1339,7 +1331,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Objects\bufferobject.c"
+				RelativePath="..\Objects\bytes_methods.c"
+				>
+			</File>
+			<File
+				RelativePath="..\Objects\bytesobject.c"
 				>
 			</File>
 			<File
@@ -1374,10 +1370,6 @@
 				RelativePath="..\Objects\dictobject.c"
 				>
 			</File>
-			<!--File
-				RelativePath="..\Objects\doubledigits.c"
-				>
-			</File-->
 			<File
 				RelativePath="..\Objects\enumobject.c"
 				>
@@ -1414,10 +1406,6 @@
 				RelativePath="..\Objects\genobject.c"
 				>
 			</File>
-			<File
-				RelativePath="..\Objects\intobject.c"
-				>
-			</File>
 			<File
 				RelativePath="..\Objects\iterobject.c"
 				>
@@ -1430,6 +1418,10 @@
 				RelativePath="..\Objects\longobject.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Objects\memoryobject.c"
+				>
+			</File>
 			<File
 				RelativePath="..\Objects\methodobject.c"
 				>
@@ -1634,6 +1626,10 @@
 				RelativePath="..\Python\errors.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\Python\frozen.c"
 				>