summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2011-06-05 17:42:21 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2011-06-05 17:42:21 (GMT)
commit63660ce21410de669f9f3f6708556304875cee63 (patch)
tree3b1f225bf72340597300290fefcbf4e3a167d09b
parentf5048a40752b8a0197ef9e4b6ace8dab75479fd7 (diff)
parent4c226dac027429d7583fb6a22c988e1f397d87e1 (diff)
downloadcpython-63660ce21410de669f9f3f6708556304875cee63.zip
cpython-63660ce21410de669f9f3f6708556304875cee63.tar.gz
cpython-63660ce21410de669f9f3f6708556304875cee63.tar.bz2
merge:Do not add txt files twice
-rw-r--r--Tools/msi/msi.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 5db62cd..53e652d 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1031,8 +1031,6 @@ def add_files(db):
lib.glob("*.0")
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':