diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-12-19 22:58:37 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-12-19 22:58:37 (GMT) |
| commit | 3d891b66e6b6a7499b605c1027c24e970a61bd7e (patch) | |
| tree | 15e47b97419b49864a3b5db9ee61e575ee273d3d /Tools | |
| parent | a9da6d1a7b4eebf974746f740962eeabbabc8bcf (diff) | |
| download | cpython-3d891b66e6b6a7499b605c1027c24e970a61bd7e.zip cpython-3d891b66e6b6a7499b605c1027c24e970a61bd7e.tar.gz cpython-3d891b66e6b6a7499b605c1027c24e970a61bd7e.tar.bz2 | |
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
........
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/crtlicense.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tools/msi/crtlicense.txt b/Tools/msi/crtlicense.txt index 8ecd499..936bc5a 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 |