diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-06-05 17:51:18 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-06-05 17:51:18 (GMT) |
| commit | 1dc4a828e9f272de07cb2885dec5c9b8fcad8003 (patch) | |
| tree | 35d7ca46f7a9aaf173293379f411bafa82b9c655 | |
| parent | a493ca3fae4dc6e07c3dc57eb7621c90ba8c7189 (diff) | |
| parent | 2231e1a01fa2113fb26c62598fe1f5119fb91075 (diff) | |
| download | cpython-1dc4a828e9f272de07cb2885dec5c9b8fcad8003.zip cpython-1dc4a828e9f272de07cb2885dec5c9b8fcad8003.tar.gz cpython-1dc4a828e9f272de07cb2885dec5c9b8fcad8003.tar.bz2 | |
merge 2.7.2 release branch
| -rw-r--r-- | Tools/msi/msi.py | 2 | ||||
| -rw-r--r-- | Tools/msi/uuids.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 6ddac91..f01aa7f 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -1022,8 +1022,6 @@ def add_files(db): lib.add_file("zipdir.zip") if dir=='tests' and parent.physical=='distutils': lib.add_file("Setup.sample") - if dir=='cjkencodings': - lib.glob("*.txt") if dir=='decimaltestdata': lib.glob("*.decTest") if dir=='xmltestdata': diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py index 1162040..681de12 100644 --- a/Tools/msi/uuids.py +++ b/Tools/msi/uuids.py @@ -53,4 +53,6 @@ product_codes = { '2.7.1121':'{60a4036a-374c-4fd2-84b9-bfae7db03931}', # 2.7.1rc1 '2.7.1122':'{5965e7d1-5584-4de9-b13a-694e0b2ee3a6}', # 2.7.1rc2 '2.7.1150':'{32939827-d8e5-470a-b126-870db3c69fdf}', # 2.7.1 + '2.7.2121':'{B2E1F06E-F719-4786-972A-488A336EB2A0}', # 2.7.2rc1 + '2.7.2150':'{2E295B5B-1AD4-4d36-97C2-A316084722CF}', # 2.7.2 } |