diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-01 04:55:33 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2010-01-01 04:55:33 (GMT) |
| commit | 370fe530c89f39008ca4deadc8c5f96adf0551f4 (patch) | |
| tree | 266a75849b5b1761af5d77e9eccd671969262827 /LICENSE | |
| parent | 1e6711b69ecb9837528c619bf1e4ab058917c077 (diff) | |
| download | cpython-370fe530c89f39008ca4deadc8c5f96adf0551f4.zip cpython-370fe530c89f39008ca4deadc8c5f96adf0551f4.tar.gz cpython-370fe530c89f39008ca4deadc8c5f96adf0551f4.tar.bz2 | |
Merged revisions 77206-77207 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r77206 | benjamin.peterson | 2010-01-01 06:47:54 +0200 (Fri, 01 Jan 2010) | 9 lines
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
........
................
r77207 | benjamin.peterson | 2010-01-01 06:49:25 +0200 (Fri, 01 Jan 2010) | 9 lines
Merged revisions 77204 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77204 | ezio.melotti | 2009-12-31 22:16:42 -0600 (Thu, 31 Dec 2009) | 1 line
more copyright year updates
........
................
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |