merge heads

This commit is contained in:
Amaury Forgeot d'Arc 2012-04-13 02:29:54 +02:00
commit b413874bc8
3 changed files with 11 additions and 0 deletions

View File

@ -655,6 +655,10 @@ SOURCE=..\..\Python\pytime.c
# End Source File
# Begin Source File
SOURCE=..\..\Python\random.c
# End Source File
# Begin Source File
SOURCE=..\..\Objects\rangeobject.c
# End Source File
# Begin Source File

View File

@ -766,6 +766,9 @@
<File
RelativePath="..\..\Python\pythonrun.c">
</File>
<File
RelativePath="..\..\Python\random.c">
</File>
<File
RelativePath="..\..\Objects\rangeobject.c">
</File>

View File

@ -1882,6 +1882,10 @@
RelativePath="..\..\Python\pythonrun.c"
>
</File>
<File
RelativePath="..\..\Python\random.c"
>
</File>
<File
RelativePath="..\..\Python\structmember.c"
>