]> granicus.if.org Git - python/commit
Merged revisions 78996 via svnmerge from
authorMartin v. Löwis <martin@v.loewis.de>
Tue, 16 Mar 2010 18:53:33 +0000 (18:53 +0000)
committerMartin v. Löwis <martin@v.loewis.de>
Tue, 16 Mar 2010 18:53:33 +0000 (18:53 +0000)
commit0077b65a9e8ce12dd0ebb4793416cf54ddfe5374
treebf716d22a1a0cb74237cba721d7bf689f5a0bf31
parent4ad70df5e7b227dbb1b0db3c45223b0e35bee8be
Merged revisions 78996 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78996 | martin.v.loewis | 2010-03-16 19:49:28 +0100 (Di, 16 Mär 2010) | 1 line

  Integrate merge.py into msi.py.
........
Tools/msi/merge.py [deleted file]
Tools/msi/msi.py