merge 3.3
This commit is contained in:
commit
ae2039e62c
|
@ -4,7 +4,7 @@ Copyright
|
|||
|
||||
Python and this documentation is:
|
||||
|
||||
Copyright © 2001-2012 Python Software Foundation. All rights reserved.
|
||||
Copyright © 2001-2013 Python Software Foundation. All rights reserved.
|
||||
|
||||
Copyright © 2000 BeOpen.com. All rights reserved.
|
||||
|
||||
|
|
|
@ -152,7 +152,7 @@ Terms and conditions for accessing or otherwise using Python
|
|||
analyze, test, perform and/or display publicly, prepare derivative works,
|
||||
distribute, and otherwise use Python |release| alone or in any derivative
|
||||
version, provided, however, that PSF's License Agreement and PSF's notice of
|
||||
copyright, i.e., "Copyright © 2001-2012 Python Software Foundation; All Rights
|
||||
copyright, i.e., "Copyright © 2001-2013 Python Software Foundation; All Rights
|
||||
Reserved" are retained in Python |release| alone or in any derivative version
|
||||
prepared by Licensee.
|
||||
|
||||
|
|
4
LICENSE
4
LICENSE
|
@ -111,8 +111,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 Python Software Foundation; All Rights Reserved" are retained in Python
|
||||
alone or in any derivative version prepared by Licensee.
|
||||
2011, 2012, 2013 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
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
static char cprt[] =
|
||||
"\
|
||||
Copyright (c) 2001-2012 Python Software Foundation.\n\
|
||||
Copyright (c) 2001-2013 Python Software Foundation.\n\
|
||||
All Rights Reserved.\n\
|
||||
\n\
|
||||
Copyright (c) 2000 BeOpen.com.\n\
|
||||
|
|
2
README
2
README
|
@ -2,7 +2,7 @@ This is Python version 3.4.0 prerelease
|
|||
=======================================
|
||||
|
||||
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
|
||||
2012 Python Software Foundation. All rights reserved.
|
||||
2012, 2013 Python Software Foundation. All rights reserved.
|
||||
|
||||
Python 3.x is a new version of the language, which is incompatible with the 2.x
|
||||
line of releases. The language is mostly the same, but many details, especially
|
||||
|
|
Loading…
Reference in New Issue