From: Amaury Forgeot d'Arc Date: Fri, 19 Dec 2008 23:00:01 +0000 (+0000) Subject: Merged revisions 67860 via svnmerge from X-Git-Tag: v3.0.1~229 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dd2d1400a05273b7d098658fe803858ba4d77b7;p=thirdparty%2FPython%2Fcpython.git Merged revisions 67860 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r67860 | amaury.forgeotdarc | 2008-12-19 23:58:37 +0100 (ven., 19 déc. 2008) | 11 lines 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 ........ ................ --- diff --git a/Tools/msi/crtlicense.txt b/Tools/msi/crtlicense.txt index 8ecd49935d57..936bc5ad532d 100644 --- a/Tools/msi/crtlicense.txt +++ b/Tools/msi/crtlicense.txt @@ -26,7 +26,7 @@ complies with this agreement, provided that you do not: - alter any copyright, trademark or patent notice in Microsoft's Distributable Code; -- use Microsoft’s 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