diff options
| author | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-08-16 23:48:43 (GMT) |
| commit | af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9 (patch) | |
| tree | 7719b2787d82dd1cc7afad76ad989fc9b1f1504f /Tools | |
| parent | 10c17ba299513184e39c85fc5c3ecaf2fd13187e (diff) | |
| download | cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.zip cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.gz cpython-af554a0e17ceb0e6a3cc0c07e9cf6db2f80c1ad9.tar.bz2 | |
First merge from the trunk straight into the py3k branch. I'm not
using the message generated by svnmerge, because it contains a lot of
stuff about the Doc tree, which I'm not merging this time due to the
way the Doc tree was initially added. I am however adding roman.py
which was added later to Doc/tools. I'll try to diff the two Doc
trees separately to see if there's stuff I missed.
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 93c6ba7..adf470f 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -104,6 +104,7 @@ msvcr71_uuid = "{8666C8DD-D0B4-4B42-928E-A69E32FA5D4D}" pythondll_uuid = { "24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}", "25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}" + "26":"{34ebecac-f046-4e1c-b0e3-9bac3cdaacfa}", } [major+minor] # Build the mingw import library, libpythonXY.a |