diff options
author | Benjamin Peterson <benjamin@python.org> | 2014-01-01 04:02:41 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2014-01-01 04:02:41 (GMT) |
commit | a015bb1e2ba036624007d640d27115b4252bd497 (patch) | |
tree | 3bba18e6cb907ad2f81c3998bd6e3c6e653f25d5 | |
parent | b6728880927dbd290fd11f553b42316eb9c4b09d (diff) | |
parent | fa10ae097855c5bf927414fce2cc12aee3cdcc98 (diff) | |
download | cpython-a015bb1e2ba036624007d640d27115b4252bd497.zip cpython-a015bb1e2ba036624007d640d27115b4252bd497.tar.gz cpython-a015bb1e2ba036624007d640d27115b4252bd497.tar.bz2 |
merge 3.3
-rw-r--r-- | Doc/README.txt | 2 | ||||
-rw-r--r-- | Doc/copyright.rst | 2 | ||||
-rw-r--r-- | Doc/license.rst | 2 | ||||
-rw-r--r-- | LICENSE | 2 | ||||
-rw-r--r-- | PC/python_nt.rc | 2 | ||||
-rw-r--r-- | Python/getcopyright.c | 2 | ||||
-rw-r--r-- | README | 4 |
7 files changed, 8 insertions, 8 deletions
diff --git a/Doc/README.txt b/Doc/README.txt index 64e307e..4a157d5 100644 --- a/Doc/README.txt +++ b/Doc/README.txt @@ -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: ---------------------------------------------------------------------- -Copyright (c) 2000-2013 Python Software Foundation. +Copyright (c) 2000-2014 Python Software Foundation. All rights reserved. Copyright (c) 2000 BeOpen.com. diff --git a/Doc/copyright.rst b/Doc/copyright.rst index 94f777c..be47e8a 100644 --- a/Doc/copyright.rst +++ b/Doc/copyright.rst @@ -4,7 +4,7 @@ Copyright 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. diff --git a/Doc/license.rst b/Doc/license.rst index dc1935b..29d4283 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -84,7 +84,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-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 prepared by Licensee. @@ -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, 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 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. 3. In the event Licensee prepares a derivative work that is based on diff --git a/PC/python_nt.rc b/PC/python_nt.rc index 199533c..52bf823 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -61,7 +61,7 @@ BEGIN VALUE "FileDescription", "Python Core\0" VALUE "FileVersion", PYTHON_VERSION 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 "ProductName", "Python\0" VALUE "ProductVersion", PYTHON_VERSION diff --git a/Python/getcopyright.c b/Python/getcopyright.c index 2b19622..130dec1 100644 --- a/Python/getcopyright.c +++ b/Python/getcopyright.c @@ -4,7 +4,7 @@ static const char cprt[] = "\ -Copyright (c) 2001-2013 Python Software Foundation.\n\ +Copyright (c) 2001-2014 Python Software Foundation.\n\ All Rights Reserved.\n\ \n\ Copyright (c) 2000 BeOpen.com.\n\ @@ -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, -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 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, -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. |