diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-09-14 20:27:52 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-09-14 20:27:52 (GMT) |
| commit | b29f2d710189c1eff01d50e5b9adaa663a0d96ee (patch) | |
| tree | 66125446454c890e57b3f7aa1a633ac835a5ae3e /Tools/msi/msi.py | |
| parent | 3a2fb1444ac8d8fefe0d83f4f2d680e64d21a2e2 (diff) | |
| download | cpython-b29f2d710189c1eff01d50e5b9adaa663a0d96ee.zip cpython-b29f2d710189c1eff01d50e5b9adaa663a0d96ee.tar.gz cpython-b29f2d710189c1eff01d50e5b9adaa663a0d96ee.tar.bz2 | |
Merged revisions 66460-66461 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r66460 | martin.v.loewis | 2008-09-14 22:22:39 +0200 (So, 14 Sep 2008) | 1 line
Issue #3617: Include a licensing statement regarding the Microsoft C runtime in the Windows installer.
........
r66461 | martin.v.loewis | 2008-09-14 22:25:40 +0200 (So, 14 Sep 2008) | 1 line
Set eol-style to native.
........
Diffstat (limited to 'Tools/msi/msi.py')
| -rw-r--r-- | Tools/msi/msi.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 0557bd3..8a8189e 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -862,6 +862,7 @@ def generate_license(): import shutil, glob out = open("LICENSE.txt", "w") shutil.copyfileobj(open(os.path.join(srcdir, "LICENSE")), out) + shutil.copyfileobj(open("crtlicense.txt"), out) for name, pat, file in (("bzip2","bzip2-*", "LICENSE"), ("Berkeley DB", "db-*", "LICENSE"), ("openssl", "openssl-*", "LICENSE"), |