]> git.ipfire.org Git - thirdparty/Python/cpython.git/commit
Remove conflict markers and add parsermodule.c to get things building
authorMark Hammond <mhammond@skippinet.com.au>
Sun, 23 Oct 2005 10:50:04 +0000 (10:50 +0000)
committerMark Hammond <mhammond@skippinet.com.au>
Sun, 23 Oct 2005 10:50:04 +0000 (10:50 +0000)
commit5da5b5bd47f6e3508ff797182e1220c15fdaec12
treead4b325bb0604000b887ad02aba1c2c1514bd8a7
parentd56827c38f5a4e438e01665b04f607963c791af8
Remove conflict markers and add parsermodule.c to get things building
PCbuild/pythoncore.vcproj