From 94d6201eb066fc769786f0c52ffc859fc6169d50 Mon Sep 17 00:00:00 2001 From: Anthony Baxter Date: Thu, 10 Mar 2005 13:47:17 +0000 Subject: [PATCH] merge from branches --- LICENSE | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index a6d3a5cd2d0..275c86cd499 100644 --- a/LICENSE +++ b/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