Commit bcedc92e authored by Ezio Melotti's avatar Ezio Melotti

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
........
parent eeb08970
...@@ -4,7 +4,7 @@ Copyright ...@@ -4,7 +4,7 @@ Copyright
Python and this documentation is: 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. Copyright © 2000 BeOpen.com. All rights reserved.
......
...@@ -130,7 +130,7 @@ Terms and conditions for accessing or otherwise using Python ...@@ -130,7 +130,7 @@ Terms and conditions for accessing or otherwise using Python
analyze, test, perform and/or display publicly, prepare derivative works, analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python |release| alone or in any derivative distribute, and otherwise use Python |release| alone or in any derivative
version, provided, however, that PSF's License Agreement and PSF's notice of 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 Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee. prepared by Licensee.
......
...@@ -96,9 +96,9 @@ grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce, ...@@ -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, analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python alone or in any derivative version, distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright, 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 i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Software Foundation; All Rights Reserved" are retained in Python alone or in any Python Software Foundation; All Rights Reserved" are retained in Python alone or
derivative version prepared by Licensee. in any derivative version prepared by Licensee.
3. In the event Licensee prepares a derivative work that is based on 3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make or incorporates Python or any part thereof, and wants to make
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
static char cprt[] = static char cprt[] =
"\ "\
Copyright (c) 2001-2009 Python Software Foundation.\n\ Copyright (c) 2001-2010 Python Software Foundation.\n\
All Rights Reserved.\n\ All Rights Reserved.\n\
\n\ \n\
Copyright (c) 2000 BeOpen.com.\n\ Copyright (c) 2000 BeOpen.com.\n\
......
This is Python version 2.6.4 This is Python version 2.6.4
============================ ============================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
Python Software Foundation. Python Software Foundation.
All rights reserved. All rights reserved.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment