From df014bf604406e4ee75869f285a17443bcae0650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Fri, 19 Sep 2008 15:24:28 +0000 Subject: Merged revisions 66514 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r66514 | martin.v.loewis | 2008-09-19 17:21:07 +0200 (Fr, 19 Sep 2008) | 2 lines Bug #3887: Package x64 version of CRT for AMD64 Windows binaries. ........ --- Tools/msi/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py index 4123567..3202f98 100644 --- a/Tools/msi/merge.py +++ b/Tools/msi/merge.py @@ -9,7 +9,7 @@ msi = None if len(sys.argv)==2: msi = sys.argv[1] if Win64: - modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"] + modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"] if not msi: msi = "python-%s.amd64.msi" % full_current_version else: modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"] -- cgit v0.12