From 4c226dac027429d7583fb6a22c988e1f397d87e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 5 Jun 2011 10:55:57 +0200
Subject: Do not add txt files twice.

---
 Tools/msi/msi.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 78ff51b..b668c7a 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1021,8 +1021,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=='output':
-- 
cgit v0.12


From 721bb33e3be644eca0f99b7e11bf183ff84a88fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Sun, 5 Jun 2011 10:56:44 +0200
Subject: Add 3.1.4 UUIDs.

---
 Tools/msi/uuids.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
index a5e5cd2..7e0ee5a 100644
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -80,4 +80,6 @@ product_codes = {
     '3.1.3121':'{a1e436f8-92fc-4ddb-af18-a12529c57aaf}', # 3.1.3rc1
     '3.1.3122':'{2fc19026-a3e5-493e-92a0-c1f3b4a272ae}', # 3.1.3rc2
     '3.1.3150':'{f719d8a6-46fc-4d71-94c6-ffd17a8c9f35}', # 3.1.3
+    '3.1.4121':'{3921EAA3-08F4-4e9b-A42B-0BFC9C3D13F8}', # 3.1.4rc1
+    '3.1.4150':'{1ACA3135-BA08-41a9-8019-9BFA2BD1C4EE}', # 3.1.4
 }
-- 
cgit v0.12