summaryrefslogtreecommitdiffstats
path: root/Tools/msi
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-02-28 20:02:27 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-02-28 20:02:27 (GMT)
commit70e7ea23f18aacc31f429787645ff8c074c0ad86 (patch)
treebeb83e14c2f9fdd729914234d9979b50a70718c3 /Tools/msi
parent9e7f1d2e965400edcb2c0cb7fee625ef2b595eb5 (diff)
downloadcpython-70e7ea23f18aacc31f429787645ff8c074c0ad86.zip
cpython-70e7ea23f18aacc31f429787645ff8c074c0ad86.tar.gz
cpython-70e7ea23f18aacc31f429787645ff8c074c0ad86.tar.bz2
Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61097,61103-61108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61105 | andrew.kuchling | 2008-02-28 15:03:03 +0100 (Thu, 28 Feb 2008) | 1 line #2169: make generated HTML more valid ........ r61106 | jeffrey.yasskin | 2008-02-28 19:03:15 +0100 (Thu, 28 Feb 2008) | 4 lines Prevent SocketServer.ForkingMixIn from waiting on child processes that it didn't create, in most cases. When there are max_children handlers running, it will still wait for any child process, not just handler processes. ........ r61107 | raymond.hettinger | 2008-02-28 20:41:24 +0100 (Thu, 28 Feb 2008) | 1 line Document impending updates to itertools. ........ r61108 | martin.v.loewis | 2008-02-28 20:44:22 +0100 (Thu, 28 Feb 2008) | 1 line Add 2.6aN uuids. ........
Diffstat (limited to 'Tools/msi')
-rw-r--r--Tools/msi/uuids.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
index 20517fc..aa32030 100644
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -37,6 +37,10 @@ product_codes = {
'2.5.1150':'{31800004-6386-4999-a519-518f2d78d8f0}', # 2.5.1
'2.5.2150':'{6304a7da-1132-4e91-a343-a296269eab8a}', # 2.5.2c1
'2.5.2150':'{6b976adf-8ae8-434e-b282-a06c7f624d2f}', # 2.5.2
+ '2.6.101': '{0ba82e1b-52fd-4e03-8610-a6c76238e8a8}', # 2.6a1
+ '2.6.102': '{3b27e16c-56db-4570-a2d3-e9a26180c60b}', # 2.6a2
+ '2.6.103': '{cd06a9c5-bde5-4bd7-9874-48933997122a}', # 2.6a3
+ '2.6.104': '{dc6ed634-474a-4a50-a547-8de4b7491e53}', # 2.6a4
'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