Skip to content

C
cpython
Commit f2be8d75 authored by Benjamin Peterson's avatar Benjamin Peterson
Browse files
Options

merge 3.4

parents 4c702937 86fb46d4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
LICENSE
View file @ f2be8d75
...@@ -74,8 +74,9 @@ analyze, test, perform and/or display publicly, prepare derivative works, ...@@ -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, distribute, and otherwise use Python alone or in any derivative version,
provided, however, that PSF's License Agreement and PSF's notice of copyright, 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, 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" 2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights
are retained in Python alone or in any derivative version prepared by Licensee. 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 3. In the event Licensee prepares a derivative work that is based on
or incorporates Python or any part thereof, and wants to make or incorporates Python or any part thereof, and wants to make
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7