summaryrefslogtreecommitdiffstats
path: root/Tools/msi/merge.py
Commit message (Expand)AuthorAgeFilesLines
* Merged revisions 69415,69591,69593 via svnmerge fromBenjamin Peterson2009-02-201-0/+6
* Merged revisions 66722 via svnmerge fromMartin v. Löwis2008-10-021-2/+2
* Merged revisions 66514 via svnmerge fromMartin v. Löwis2008-09-191-1/+1
* Merged revisions 66304-66305,66307 via svnmerge fromMartin v. Löwis2008-09-081-3/+6
* Revert r63378. These files need to stay compatible with Python 2.x (until Pyt...Martin v. Löwis2008-07-181-13/+13
* More 2to3 fixes in the Tools directory. Fixes #2893.Georg Brandl2008-05-161-13/+13
* Merged revisions 62207-62210 via svnmerge fromMartin v. Löwis2008-04-071-0/+5
* Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-...Martin v. Löwis2008-04-051-0/+70