summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-09-19 15:24:28 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-09-19 15:24:28 (GMT)
commitdf014bf604406e4ee75869f285a17443bcae0650 (patch)
treed4d8abc8580c1cb23c544f435cdf88ceae6f912b /Tools
parentb68828cf98aa9a23c6afc6afd9b7c0b05b65bd7c (diff)
downloadcpython-df014bf604406e4ee75869f285a17443bcae0650.zip
cpython-df014bf604406e4ee75869f285a17443bcae0650.tar.gz
cpython-df014bf604406e4ee75869f285a17443bcae0650.tar.bz2
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. ........
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/merge.py2
1 files changed, 1 insertions, 1 deletions
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"]