diff options
author | Benjamin Peterson <benjamin@python.org> | 2016-01-01 17:12:49 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2016-01-01 17:12:49 (GMT) |
commit | 86fb46d439bb9f73658ccbd36cbbb20ead795617 (patch) | |
tree | 42293cf06cb7f1731ec2ffc554e0738163105a46 | |
parent | e8c2a957c87980a1fd79c39597d40e5c5aeb7048 (diff) | |
parent | 16b347b3de7f402dda9fdfcabb2e37f1229f2053 (diff) | |
download | cpython-86fb46d439bb9f73658ccbd36cbbb20ead795617.zip cpython-86fb46d439bb9f73658ccbd36cbbb20ead795617.tar.gz cpython-86fb46d439bb9f73658ccbd36cbbb20ead795617.tar.bz2 |
merge 3.3
-rw-r--r-- | LICENSE | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -74,8 +74,9 @@ 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, 2015,2016 Python Software Foundation; All Rights Reserved" -are retained in Python alone or in any derivative version prepared by Licensee. +2011, 2012, 2013, 2014, 2015, 2016 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 |