From: Michael W. Hudson Date: Wed, 27 Feb 2002 13:33:29 +0000 (+0000) Subject: backport my checkin of X-Git-Tag: v2.2.1c1~151 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4605ec9bbf04801da0fc3f7641c5e300b8f9fd61;p=thirdparty%2FPython%2Fcpython.git backport my checkin of revision 1.19 of LICENSE revision 1.140 of README Add 2002 to PSF copyrights. + some other branch specific stuff. --- diff --git a/LICENSE b/LICENSE index f7c869124075..b11a335f9d8b 100644 --- a/LICENSE +++ b/LICENSE @@ -36,6 +36,7 @@ the various releases. 2.0.1 2.0+1.6.1 2001 PSF yes 2.1.1 2.1+2.0.1 2001 PSF yes 2.2 2.1.1 2001 PSF yes + 2.2.1 2.2 2002 PSF yes Footnotes: @@ -66,8 +67,9 @@ license to reproduce, analyze, test, perform and/or display publicly, prepare derivative works, distribute, and otherwise use Python 2.2 alone or in any derivative version, provided, however, that PSF's License Agreement and PSF's notice of copyright, i.e., "Copyright (c) -2001 Python Software Foundation; All Rights Reserved" are retained in -Python 2.2 alone or in any derivative version prepared by Licensee. +2001, 2002 Python Software Foundation; All Rights Reserved" are +retained in Python 2.2 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 2.2 or any part thereof, and wants to make diff --git a/README b/README index 277d3e07aca7..ee57182b663c 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -This is Python version 2.2 -========================== +This is Python version 2.2.1 +============================ -Copyright (c) 2001 Python Software Foundation. +Copyright (c) 2001, 2002 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com.