[Python-checkins] r67860 - in python/branches/py3k: Tools/msi/crtlicense.txt
amaury.forgeotdarc
python-checkins at python.org
Fri Dec 19 23:58:37 CET 2008
Author: amaury.forgeotdarc
Date: Fri Dec 19 23:58:37 2008
New Revision: 67860
Log:
Merged revisions 67859 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67859 | amaury.forgeotdarc | 2008-12-19 23:56:48 +0100 (ven., 19 déc. 2008) | 4 lines
#4700: crtlicense.txt is displayed by the license() command and should be kept ascii-only.
Will port to 3.0
........
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 Fri Dec 19 23:58:37 2008
@@ -26,7 +26,7 @@
- alter any copyright, trademark or patent notice in Microsoft's
Distributable Code;
-- use Microsofts trademarks in your programs names or in a way that
+- use Microsoft's trademarks in your programs' names or in a way that
suggests your programs come from or are endorsed by Microsoft;
- distribute Microsoft's Distributable Code to run on a platform other
More information about the Python-checkins
mailing list