Mercurial > cpython-lru_cache-weakref

diff PCbuild/pythoncore.vcproj @ 44400:41bfbfc36cf7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed svn merge issues
author Christian Heimes <christian@cheimes.de>
date Mon, 31 Dec 2007 16:44:35 +0000
parents 6556f3f22c19
children b91ca87e6f32
line wrap: on
line diff
--- a/PCbuild/pythoncore.vcproj	Mon Dec 31 16:18:22 2007 +0000
+++ b/PCbuild/pythoncore.vcproj	Mon Dec 31 16:44:35 2007 +0000
@@ -651,7 +651,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Include\bufferobject.h"
+				RelativePath="..\Include\bytes_methods.h"
+				>
+			</File>
+			<File
+				RelativePath="..\Include\bytesobject.h"
 				>
 			</File>
 			<File
@@ -723,6 +727,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Include\formatter_unicode.h"
+				>
+			</File>
+			<File
 				RelativePath="..\Include\frameobject.h"
 				>
 			</File>
@@ -979,6 +987,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Modules\_fileio.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Modules\_functoolsmodule.c"
 				>
 			</File>
@@ -987,10 +999,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\_hotshot.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\_localemodule.c"
 				>
 			</File>
@@ -1023,6 +1031,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Modules\atexitmodule.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Modules\audioop.c"
 				>
 			</File>
@@ -1035,10 +1047,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\cPickle.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\cStringIO.c"
 				>
 			</File>
@@ -1055,10 +1063,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\imageop.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\itertoolsmodule.c"
 				>
 			</File>
@@ -1071,14 +1075,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\Modules\md5.h"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\md5module.c"
 				>
 			</File>
@@ -1107,6 +1103,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Modules\sha1module.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Modules\sha256module.c"
 				>
 			</File>
@@ -1115,18 +1115,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\shamodule.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\signalmodule.c"
 				>
 			</File>
 			<File
-				RelativePath="..\Modules\stropmodule.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Modules\symtablemodule.c"
 				>
 			</File>
@@ -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"
 				>
@@ -1415,10 +1407,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\Objects\intobject.c"
-				>
-			</File>
-			<File
 				RelativePath="..\Objects\iterobject.c"
 				>
 			</File>
@@ -1431,6 +1419,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Objects\memoryobject.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Objects\methodobject.c"
 				>
 			</File>
@@ -1635,6 +1627,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Python\frozen.c"
 				>
 			</File>