Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fixed svn merge issues

This commit is contained in:
Christian Heimes 2007-12-31 16:44:35 +00:00
parent 41be35d09b
commit b6b3ecc14c
2 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PCbuild/pyproject.vsprops
View File

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

72
PCbuild/pythoncore.vcproj
View File

@ -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"
>
@ -978,6 +986,10 @@
RelativePath="..\Modules\_csv.c"
>
</File>
<File
RelativePath="..\Modules\_fileio.c"
>
</File>
<File
RelativePath="..\Modules\_functoolsmodule.c"
>
@ -986,10 +998,6 @@
RelativePath="..\Modules\_heapqmodule.c"
>
</File>
<File
RelativePath="..\Modules\_hotshot.c"
>
</File>
<File
RelativePath="..\Modules\_localemodule.c"
>
@ -1022,6 +1030,10 @@
RelativePath="..\Modules\arraymodule.c"
>
</File>
<File
RelativePath="..\Modules\atexitmodule.c"
>
</File>
<File
RelativePath="..\Modules\audioop.c"
>
@ -1034,10 +1046,6 @@
RelativePath="..\Modules\cmathmodule.c"
>
</File>
<File
RelativePath="..\Modules\cPickle.c"
>
</File>
<File
RelativePath="..\Modules\cStringIO.c"
>
@ -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"
>
@ -1106,6 +1102,10 @@
RelativePath="..\Modules\rotatingtree.h"
>
</File>
<File
RelativePath="..\Modules\sha1module.c"
>
</File>
<File
RelativePath="..\Modules\sha256module.c"
>
@ -1114,18 +1114,10 @@
RelativePath="..\Modules\sha512module.c"
>
</File>
<File
RelativePath="..\Modules\shamodule.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"
>