summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-01-01 04:47:54 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-01-01 04:47:54 (GMT)
commitf8a970c02a2d833cf9b296c132880990e4afd8ee (patch)
tree0148d1f10ebc95615197349b1851de4d26357927
parent9ddcc6ed90be6488c5d7ab83c315022053ab6191 (diff)
downloadcpython-f8a970c02a2d833cf9b296c132880990e4afd8ee.zip
cpython-f8a970c02a2d833cf9b296c132880990e4afd8ee.tar.gz
cpython-f8a970c02a2d833cf9b296c132880990e4afd8ee.tar.bz2
Merged revisions 77203 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77203 | benjamin.peterson | 2009-12-31 22:00:55 -0600 (Thu, 31 Dec 2009) | 1 line update copyright year ........
-rw-r--r--LICENSE6
-rw-r--r--Python/getcopyright.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 9ce8288..fb0906f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -100,9 +100,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
diff --git a/Python/getcopyright.c b/Python/getcopyright.c
index 8864cdb..a5e7fa6 100644
--- a/Python/getcopyright.c
+++ b/Python/getcopyright.c
@@ -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\