traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.3

This commit is contained in:
Benjamin Peterson 2013-12-31 22:02:41 -06:00
parent b672888092 fa10ae0978
commit a015bb1e2b
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/README.txt
View File

@ -136,7 +136,7 @@ The Python source is copyrighted, but you can freely use and copy it
as long as you don't change or remove the copyright notice: as long as you don't change or remove the copyright notice:
---------------------------------------------------------------------- ----------------------------------------------------------------------
Copyright (c) 2000-2013 Python Software Foundation. Copyright (c) 2000-2014 Python Software Foundation.
All rights reserved. All rights reserved.
Copyright (c) 2000 BeOpen.com. Copyright (c) 2000 BeOpen.com.

2
Doc/copyright.rst
View File

@ -4,7 +4,7 @@ Copyright
Python and this documentation is: Python and this documentation is:
Copyright © 2001-2013 Python Software Foundation. All rights reserved. Copyright © 2001-2014 Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved. Copyright © 2000 BeOpen.com. All rights reserved.

2
Doc/license.rst
View File

@ -84,7 +84,7 @@ Terms and conditions for accessing or otherwise using Python
analyze, test, perform and/or display publicly, prepare derivative works, analyze, test, perform and/or display publicly, prepare derivative works,
distribute, and otherwise use Python |release| alone or in any derivative distribute, and otherwise use Python |release| alone or in any derivative
version, provided, however, that PSF's License Agreement and PSF's notice of version, provided, however, that PSF's License Agreement and PSF's notice of
copyright, i.e., "Copyright © 2001-2013 Python Software Foundation; All Rights copyright, i.e., "Copyright © 2001-2014 Python Software Foundation; All Rights
Reserved" are retained in Python |release| alone or in any derivative version Reserved" are retained in Python |release| alone or in any derivative version
prepared by Licensee. prepared by Licensee.

2
LICENSE
View File

@ -74,7 +74,7 @@ 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 Python Software Foundation; All Rights Reserved" are retained 2011, 2012, 2013, 2014 Python Software Foundation; All Rights Reserved" are retained
in Python alone or in any derivative version prepared by Licensee. 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

2
PC/python_nt.rc
View File

@ -61,7 +61,7 @@ BEGIN
VALUE "FileDescription", "Python Core\0" VALUE "FileDescription", "Python Core\0"
VALUE "FileVersion", PYTHON_VERSION VALUE "FileVersion", PYTHON_VERSION
VALUE "InternalName", "Python DLL\0" VALUE "InternalName", "Python DLL\0"
VALUE "LegalCopyright", "Copyright © 2001-2013 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0" VALUE "LegalCopyright", "Copyright © 2001-2014 Python Software Foundation. Copyright © 2000 BeOpen.com. Copyright © 1995-2001 CNRI. Copyright © 1991-1995 SMC.\0"
VALUE "OriginalFilename", PYTHON_DLL_NAME "\0" VALUE "OriginalFilename", PYTHON_DLL_NAME "\0"
VALUE "ProductName", "Python\0" VALUE "ProductName", "Python\0"
VALUE "ProductVersion", PYTHON_VERSION VALUE "ProductVersion", PYTHON_VERSION

2
Python/getcopyright.c
View File

@ -4,7 +4,7 @@
static const char cprt[] = static const char cprt[] =
"\ "\
Copyright (c) 2001-2013 Python Software Foundation.\n\ Copyright (c) 2001-2014 Python Software Foundation.\n\
All Rights Reserved.\n\ All Rights Reserved.\n\
\n\ \n\
Copyright (c) 2000 BeOpen.com.\n\ Copyright (c) 2000 BeOpen.com.\n\

4
README
View File

@ -2,7 +2,7 @@ This is Python version 3.4.0 beta 1
=================================== ===================================
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013 Python Software Foundation. All rights reserved. 2012, 2013, 2014 Python Software Foundation. All rights reserved.
Python 3.x is a new version of the language, which is incompatible with the 2.x 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 line of releases. The language is mostly the same, but many details, especially
@ -175,7 +175,7 @@ Copyright and License Information
--------------------------------- ---------------------------------
Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011,
2012, 2013 Python Software Foundation. All rights reserved. 2012, 2013, 2014 Python Software Foundation. All rights reserved.
Copyright (c) 2000 BeOpen.com. All rights reserved. Copyright (c) 2000 BeOpen.com. All rights reserved.