commit 1c4c306626af9fa9a963caf55df2e90739152107
author Martin v. Löwis <martin@v.loewis.de> Mon Sep 08 16:27:54 2008 +0000
committer Martin v. Löwis <martin@v.loewis.de> Mon Sep 08 16:27:54 2008 +0000
tree 887108ea6f26ad02554b5125970be161a824f479
parent 9a46cab6134eb8e575a54cd52d14eb2f679df718

Merged revisions 66304-66305,66307 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66304 | martin.v.loewis | 2008-09-08 14:02:45 +0200 (Mo, 08 Sep 2008) | 2 lines

  Allow passing the MSI file name to merge.py.
........
  r66305 | martin.v.loewis | 2008-09-08 15:50:10 +0200 (Mo, 08 Sep 2008) | 3 lines

  Issue #2271: Set SecureCustomProperties so that installation will properly
  use the TARGETDIR even for unprivileged users.
........
  r66307 | martin.v.loewis | 2008-09-08 18:15:38 +0200 (Mo, 08 Sep 2008) | 1 line

  Add UUIDs for upcoming releases
........

Tools/msi/uuids.py

diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
index 59d9bf4..98f14f0 100644
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -43,6 +43,10 @@
     '2.6.104': '{dc6ed634-474a-4a50-a547-8de4b7491e53}', # 2.6a4
     '2.6.111': '{3f82079a-5bee-4c4a-8a41-8292389e24ae}', # 2.6b1
     '2.6.112': '{8a0e5970-f3e6-4737-9a2b-bc5ff0f15fb5}', # 2.6b2
+    '2.6.113': '{df4f5c21-6fcc-4540-95de-85feba634e76}', # 2.6b3
+    '2.6.121': '{bbd34464-ddeb-4028-99e5-f16c4a8fbdb3}', # 2.6c1
+    '2.6.122': '{8f64787e-a023-4c60-bfee-25d3a3f592c6}', # 2.6c2
+    '2.6.150': '{110eb5c4-e995-4cfb-ab80-a5f315bea9e8}', # 2.6.0
     '3.0.101': '{8554263a-3242-4857-9359-aa87bc2c58c2}', # 3.0a1
     '3.0.102': '{692d6e2c-f0ac-40b8-a133-7191aeeb67f9}', # 3.0a2
     '3.0.103': '{49cb2995-751a-4753-be7a-d0b1bb585e06}', # 3.0a3