martin.v.loewis
2008-09-15 01:31:41 UTC
Author: martin.v.loewis
Date: Mon Sep 15 03:31:40 2008
New Revision: 66464
Log:
Merged revisions 66463 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk
........
r66463 | martin.v.loewis | 2008-09-15 03:30:21 +0200 (Mo, 15 Sep 2008) | 2 lines
Fix grammar.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/msi/crtlicense.txt
Modified: python/branches/py3k/Tools/msi/crtlicense.txt
==============================================================================
--- python/branches/py3k/Tools/msi/crtlicense.txt (original)
+++ python/branches/py3k/Tools/msi/crtlicense.txt Mon Sep 15 03:31:40 2008
@@ -31,10 +31,10 @@
- distribute Microsoft's Distributable Code to run on a platform other
than Microsoft operating systems, run-time technologies or application
-platforms;
+platforms; or
- include Microsoft Distributable Code in malicious, deceptive or
-unlawful programs; or
+unlawful programs.
These restrictions apply only to the Microsoft Distributable Code as
defined above, not to Python itself or any programs running on the
Date: Mon Sep 15 03:31:40 2008
New Revision: 66464
Log:
Merged revisions 66463 via svnmerge from
svn+ssh://pythondev at svn.python.org/python/trunk
........
r66463 | martin.v.loewis | 2008-09-15 03:30:21 +0200 (Mo, 15 Sep 2008) | 2 lines
Fix grammar.
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Tools/msi/crtlicense.txt
Modified: python/branches/py3k/Tools/msi/crtlicense.txt
==============================================================================
--- python/branches/py3k/Tools/msi/crtlicense.txt (original)
+++ python/branches/py3k/Tools/msi/crtlicense.txt Mon Sep 15 03:31:40 2008
@@ -31,10 +31,10 @@
- distribute Microsoft's Distributable Code to run on a platform other
than Microsoft operating systems, run-time technologies or application
-platforms;
+platforms; or
- include Microsoft Distributable Code in malicious, deceptive or
-unlawful programs; or
+unlawful programs.
These restrictions apply only to the Microsoft Distributable Code as
defined above, not to Python itself or any programs running on the