You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2020/09/19 23:48:01 UTC
[openoffice] branch AOO42X updated: Updated LICENSE for Python
2.7.18
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new b82f1ba Updated LICENSE for Python 2.7.18
b82f1ba is described below
commit b82f1ba4123d65a1e52d660c90bb2f1c32113151
Author: mseidel <ms...@apache.org>
AuthorDate: Sun Sep 20 01:44:36 2020 +0200
Updated LICENSE for Python 2.7.18
(cherry picked from commit 1dedf1ecff4aeffe2f7c7612cbf893530465764e)
---
main/LICENSE | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/main/LICENSE b/main/LICENSE
index 9c2cb93..6469763 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -1004,7 +1004,6 @@ ____
For integration of the library curl - built in main/curl/
- license like MIT license
-
Copyright (c) 1996 - 2020, Daniel Stenberg, <da...@haxx.se>, and many
contributors, see the THANKS file.
@@ -1618,7 +1617,7 @@ SUCH DAMAGE.
____
-For Python version 2.6.1 - built in /main/python:
+For Python version 2.7.18 - built in /main/python:
- Python Software Foundation License
PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
@@ -1635,8 +1634,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, 2013, 2014, 2015, 2016, 2017, 2018 Python Software Foundation; All
-Rights Reserved" are retained in Python alone or in any derivative version
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 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
@@ -1791,6 +1790,7 @@ bound by the terms and conditions of this License Agreement.
ACCEPT
+
CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
--------------------------------------------------