diff options
| author |   Anthony Baxter <anthonybaxter@gmail.com> | 2005-03-10 13:47:17 +0000 |
|---|---|---|
| committer | Anthony Baxter <anthonybaxter@gmail.com> | 2005-03-10 13:47:17 +0000 |
| commit | 94d6201eb066fc769786f0c52ffc859fc6169d50 (patch) | |
| tree | 027431a5981c48a8b80bb74cac81182cba7591a7 /LICENSE | |
| parent | - fix generated Texinfo markup for \deprecated (diff) | |
| download | cpython-94d6201eb066fc769786f0c52ffc859fc6169d50.tar.gz cpython-94d6201eb066fc769786f0c52ffc859fc6169d50.tar.bz2 cpython-94d6201eb066fc769786f0c52ffc859fc6169d50.zip | |
merge from branches
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -47,7 +47,9 @@ the various releases. 2.3.2 2.3.1 2002-2003 PSF yes 2.3.3 2.3.2 2002-2003 PSF yes 2.3.4 2.3.3 2004 PSF yes + 2.3.5 2.3.4 2005 PSF yes 2.4 2.3 2004 PSF yes + 2.4.1 2.4 2005 PSF yes Footnotes: @@ -83,9 +85,9 @@ license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved" -are retained in Python alone or in any derivative version prepared -by Licensee. +2001, 2002, 2003, 2004, 2005 Python Software Foundation; All Rights +Reserved" are retained in Python alone or in any derivative version +prepared by Licensee. 3. In the event Licensee prepares a derivative work that is based on or incorporates Python or any part thereof, and wants to make |