merge from branches
This commit is contained in:
parent
346803e060
commit
94d6201eb0
8
LICENSE
8
LICENSE
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue