diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-31 16:44:35 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-31 16:44:35 (GMT) |
| commit | b6b3ecc14c0f2e947c9c749eba1da783fe66fe8e (patch) | |
| tree | 7df78c5e4db99b4a9dd9200fb60048f751c9bc08 | |
| parent | 41be35d09bb6b83302df300628aa6c8d2157040c (diff) | |
| download | cpython-b6b3ecc14c0f2e947c9c749eba1da783fe66fe8e.zip cpython-b6b3ecc14c0f2e947c9c749eba1da783fe66fe8e.tar.gz cpython-b6b3ecc14c0f2e947c9c749eba1da783fe66fe8e.tar.bz2 | |
Fixed svn merge issues
| -rw-r--r-- | PCbuild/pyproject.vsprops | 2 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 68 |
2 files changed, 33 insertions, 37 deletions
diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index eaea0be..64cadc3 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -38,7 +38,7 @@ /> <UserMacro Name="PyDllName" - Value="python26" + Value="python30" /> <UserMacro Name="PythonExe" diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index ff27052..413e407 100644 --- a/PCbuild/pythoncore.vcproj +++ b/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 @@ -723,6 +727,10 @@ > </File> <File + RelativePath="..\Include\formatter_unicode.h" + > + </File> + <File RelativePath="..\Include\frameobject.h" > </File> @@ -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 @@ -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,15 +1103,15 @@ > </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 @@ -1123,10 +1119,6 @@ > </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> |