diff options
| author | Mark Hammond <mhammond@skippinet.com.au> | 2005-10-23 10:50:04 (GMT) |
|---|---|---|
| committer | Mark Hammond <mhammond@skippinet.com.au> | 2005-10-23 10:50:04 (GMT) |
| commit | 5da5b5bd47f6e3508ff797182e1220c15fdaec12 (patch) | |
| tree | ad4b325bb0604000b887ad02aba1c2c1514bd8a7 /PCbuild/pythoncore.vcproj | |
| parent | d56827c38f5a4e438e01665b04f607963c791af8 (diff) | |
| download | cpython-5da5b5bd47f6e3508ff797182e1220c15fdaec12.zip cpython-5da5b5bd47f6e3508ff797182e1220c15fdaec12.tar.gz cpython-5da5b5bd47f6e3508ff797182e1220c15fdaec12.tar.bz2 | |
Remove conflict markers and add parsermodule.c to get things building
Diffstat (limited to 'PCbuild/pythoncore.vcproj')
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj index ff9e48b..48d1489 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -815,6 +815,9 @@ RelativePath="..\Modules\collectionsmodule.c"> </File> <File + RelativePath="..\Python\compile.c"> + </File> + <File RelativePath="..\Objects\complexobject.c"> <FileConfiguration Name="Release|Win32"> @@ -2318,9 +2321,6 @@ </FileConfiguration> </File> <File - RelativePath="..\Python\compile.c"> - </File> - <File RelativePath="..\Parser\node.c"> <FileConfiguration Name="Release|Win32"> @@ -2456,6 +2456,9 @@ </FileConfiguration> </File> <File + RelativePath="..\Modules\parsermodule.c"> + </File> + <File RelativePath="..\Parser\parsetok.c"> <FileConfiguration Name="Release|Win32"> @@ -2759,7 +2762,7 @@ </FileConfiguration> </File> <File - RelativePath="..\Modules\shamodule.c"> + RelativePath="..\Modules\sha256module.c"> <FileConfiguration Name="Release|Win32"> <Tool @@ -2786,8 +2789,7 @@ </FileConfiguration> </File> <File -<<<<<<< pythoncore.vcproj - RelativePath="..\Modules\sha256module.c"> + RelativePath="..\Modules\sha512module.c"> <FileConfiguration Name="Release|Win32"> <Tool @@ -2814,7 +2816,7 @@ </FileConfiguration> </File> <File - RelativePath="..\Modules\sha512module.c"> + RelativePath="..\Modules\sha512module.c"> <FileConfiguration Name="Release|Win32"> <Tool @@ -2841,10 +2843,7 @@ </FileConfiguration> </File> <File - RelativePath="..\Modules\signalmodule.c"> -======= - RelativePath="..\Modules\sha256module.c"> ->>>>>>> 1.26.2.3 + RelativePath="..\Modules\shamodule.c"> <FileConfiguration Name="Release|Win32"> <Tool @@ -2871,7 +2870,7 @@ </FileConfiguration> </File> <File - RelativePath="..\Modules\sha512module.c"> + RelativePath="..\Modules\signalmodule.c"> <FileConfiguration Name="Release|Win32"> <Tool |