Merged revisions 77203-77204 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77203 | benjamin.peterson | 2010-01-01 06:00:55 +0200 (Fri, 01 Jan 2010) | 1 line update copyright year ........ r77204 | ezio.melotti | 2010-01-01 06:16:42 +0200 (Fri, 01 Jan 2010) | 1 line more copyright year updates ........
This commit is contained in:
parent
1264f1effb
commit
558a57a1f2
|
@ -4,7 +4,7 @@ Copyright
|
|||
|
||||
Python and this documentation is:
|
||||
|
||||
Copyright © 2001-2009 Python Software Foundation. All rights reserved.
|
||||
Copyright © 2001-2010 Python Software Foundation. All rights reserved.
|
||||
|
||||
Copyright © 2000 BeOpen.com. All rights reserved.
|
||||
|
||||
|
|
|
@ -130,7 +130,7 @@ Terms and conditions for accessing or otherwise using Python
|
|||
analyze, test, perform and/or display publicly, prepare derivative works,
|
||||
distribute, and otherwise use Python |release| alone or in any derivative
|
||||
version, provided, however, that PSF's License Agreement and PSF's notice of
|
||||
copyright, i.e., "Copyright © 2001-2009 Python Software Foundation; All Rights
|
||||
copyright, i.e., "Copyright © 2001-2010 Python Software Foundation; All Rights
|
||||
Reserved" are retained in Python |release| alone or in any derivative version
|
||||
prepared by Licensee.
|
||||
|
||||
|
|
6
LICENSE
6
LICENSE
|
@ -96,9 +96,9 @@ grants Licensee a nonexclusive, royalty-free, world-wide 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, 2005, 2006, 2007, 2008, 2009 Python
|
||||
Software Foundation; All Rights Reserved" are retained in Python alone or in any
|
||||
derivative version prepared by Licensee.
|
||||
i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
||||
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
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
static char cprt[] =
|
||||
"\
|
||||
Copyright (c) 2001-2009 Python Software Foundation.\n\
|
||||
Copyright (c) 2001-2010 Python Software Foundation.\n\
|
||||
All Rights Reserved.\n\
|
||||
\n\
|
||||
Copyright (c) 2000 BeOpen.com.\n\
|
||||
|
|
Loading…
Reference in New Issue