diff options
| author |   Benjamin Peterson <benjamin@python.org> | 2011-12-31 22:43:01 -0600 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-12-31 22:43:01 -0600 |
| commit | a174577f55634c4de63204b03c0ebcde131cda28 (patch) | |
| tree | cf095587a263c5f163bad07ce3b208f9f178065f /LICENSE | |
| parent | merge with 3.2 (diff) | |
| parent | merge heads (diff) | |
| download | cpython-a174577f55634c4de63204b03c0ebcde131cda28.tar.gz cpython-a174577f55634c4de63204b03c0ebcde131cda28.tar.bz2 cpython-a174577f55634c4de63204b03c0ebcde131cda28.zip | |
merge 3.2
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -109,7 +109,7 @@ 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 Python Software Foundation; All Rights Reserved" are retained in Python +2011, 2012 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 |