diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-01-01 00:10:13 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-01-01 00:10:13 (GMT) |
| commit | 7919acb9202e1b4cf703d54a9346b980f8885a29 (patch) | |
| tree | 2ba4872b50ee3e660aa2bfa97a3a9ba2e0e4db1a /LICENSE | |
| parent | 9582b33933692a432d9285a7b89091356e78aad6 (diff) | |
| parent | 47e782a67a79e7d4fdc4536c6d6935c0e3b45705 (diff) | |
| download | cpython-7919acb9202e1b4cf703d54a9346b980f8885a29.zip cpython-7919acb9202e1b4cf703d54a9346b980f8885a29.tar.gz cpython-7919acb9202e1b4cf703d54a9346b980f8885a29.tar.bz2 | |
merge 3.2
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -74,8 +74,8 @@ 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, 2010, -2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are retained -in Python alone or in any derivative version prepared by Licensee. +2011, 2012, 2013, 2014, 2015 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 |