Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
e8c2a957
Commit
e8c2a957
authored
Jan 01, 2016
by
Benjamin Peterson
Browse files
Options
Browse Files
Download
Plain Diff
merge 3.3
parents
52d6c2c4
75e3630c
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
8 additions
and
8 deletions
+8
-8
Doc/copyright.rst
Doc/copyright.rst
+1
-1
Doc/license.rst
Doc/license.rst
+3
-3
LICENSE
LICENSE
+1
-1
PC/python_nt.rc
PC/python_nt.rc
+1
-1
Python/getcopyright.c
Python/getcopyright.c
+1
-1
README
README
+1
-1
No files found.
Doc/copyright.rst
View file @
e8c2a957
...
@@ -4,7 +4,7 @@ Copyright
...
@@ -4,7 +4,7 @@ Copyright
Python and this documentation is:
Python and this documentation is:
Copyright © 2001-201
5
Python Software Foundation. All rights reserved.
Copyright © 2001-201
6
Python Software Foundation. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved.
Copyright © 2000 BeOpen.com. All rights reserved.
...
...
Doc/license.rst
View file @
e8c2a957
...
@@ -84,9 +84,9 @@ Terms and conditions for accessing or otherwise using Python
...
@@ -84,9 +84,9 @@ 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-201
5 Python Software Foundation; All
copyright, i.e., "Copyright © 2001-201
6 Python Software Foundation; All Rights
R
ights Reserved" are retained in Python |release| alone or in any derivative
R
eserved" are retained in Python |release| alone or in any derivative version
version
prepared by Licensee.
prepared by Licensee.
#. In the event Licensee prepares a derivative work that is based on or
#. In the event Licensee prepares a derivative work that is based on or
incorporates Python |release| or any part thereof, and wants to make the
incorporates Python |release| or any part thereof, and wants to make the
...
...
LICENSE
View file @
e8c2a957
...
@@ -74,7 +74,7 @@ analyze, test, perform and/or display publicly, prepare derivative works,
...
@@ -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, 2014, 2015 Python Software Foundation; All Rights Reserved"
2011, 2012, 2013, 2014, 2015
,2016
Python Software Foundation; All Rights Reserved"
are retained in Python alone or in any derivative version prepared by Licensee.
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
...
...
PC/python_nt.rc
View file @
e8c2a957
...
@@ -61,7 +61,7 @@ BEGIN
...
@@ -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-201
5
Python Software Foundation. Copyright 2000 BeOpen.com. Copyright 1995-2001 CNRI. Copyright 1991-1995 SMC.\0"
VALUE "LegalCopyright", "Copyright 2001-201
6
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
...
...
Python/getcopyright.c
View file @
e8c2a957
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
static
const
char
cprt
[]
=
static
const
char
cprt
[]
=
"\
"\
Copyright (c) 2001-201
5
Python Software Foundation.
\n
\
Copyright (c) 2001-201
6
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
\
...
...
README
View file @
e8c2a957
...
@@ -2,7 +2,7 @@ This is Python version 3.4.4
...
@@ -2,7 +2,7 @@ This is Python version 3.4.4
============================
============================
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, 2014, 2015 Python Software Foundation. All rights reserved.
2012, 2013, 2014, 2015
, 2016
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment