summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-03-19 01:22:45 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-03-19 01:22:45 (GMT)
commitf72ef7882c9ad5d6e1324816d630dac42ead4bc4 (patch)
tree4a581ce3529d28a830a84497fe496549317dd889
parentdbc52f8a0d3c496e642dbc92c684f873e67f3127 (diff)
parentcdc60aac3de07da0ff3cbbfcfd8f228200aecaf9 (diff)
downloadcpython-f72ef7882c9ad5d6e1324816d630dac42ead4bc4.zip
cpython-f72ef7882c9ad5d6e1324816d630dac42ead4bc4.tar.gz
cpython-f72ef7882c9ad5d6e1324816d630dac42ead4bc4.tar.bz2
merge 2.7.3 release branch
-rw-r--r--Tools/msi/uuids.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
index 94d8800..cf5bfd2 100644
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -56,6 +56,7 @@ product_codes = {
'2.7.2121':'{B2E1F06E-F719-4786-972A-488A336EB2A0}', # 2.7.2rc1
'2.7.2150':'{2E295B5B-1AD4-4d36-97C2-A316084722CF}', # 2.7.2
'2.7.3121':'{1ACB88BF-1425-4f11-B664-6C89A3D7699C}', # 2.7.3rc1
+ '2.7.3122':'{B12311BE-6364-4b2a-A49A-551EEE10F3E4}', # 2.7.3rc2
'2.7.3150':'{C0C31BCC-56FB-42a7-8766-D29E1BD74C7C}', # 2.7.3
'2.7.4121':'{47F45F45-72D7-4e54-AF41-26767EDE95CF}', # 2.7.4rc1
'2.7.4150':'{84ADC96C-B7E0-4938-9D6E-2B640D5DA224}', # 2.7.4