From ed5522c7c2bd596f7e5c6971ea3227f22593709c Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 9 Feb 2016 08:10:40 +0000 Subject: [PATCH 1/2] addresses #121 --- LICENSE | 6 ++++-- README.rst | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index af4c9fd6..00120f8f 100644 --- a/LICENSE +++ b/LICENSE @@ -6,10 +6,12 @@ for their respective work, and release the work under the MIT licence Exceptions or notable authors are listed below in reverse chronological order: -* [CC-BY-SA-4.0] 2015-2016 Casper da Costa-Luis - [casperdcl](https://github.com/casperdcl) +* [LGPLv3] 2015-2016 Casper da Costa-Luis + [casperdcl](https://github.com/casperdcl). + An alternative [CC-BY-SA-4.0] licence is also available. * MIT 2016 [PR #96] Google Inc. + [LGPLv3]: http://www.gnu.org/licenses/lgpl-3.0.en.html [CC-BY-SA-4.0]: http://creativecommons.org/licenses/by-sa/4.0/ [PR #96]: https://github.com/tqdm/tqdm/pull/96 diff --git a/README.rst b/README.rst index d0eb90e1..5921e17d 100644 --- a/README.rst +++ b/README.rst @@ -549,7 +549,7 @@ file for more information. License ------- -Mostly `CC, MIT licence `__. +Mostly `LGPLv3, MIT licence `__. A CC-BY-SA alternative is also available. Authors From dae8f31747e4b86f3ae8145a45875645a71cf340 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 16 Feb 2016 22:10:06 +0000 Subject: [PATCH 2/2] MPL --- LICENSE => LICENCE | 18 +++++++++++------- README.rst | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) rename LICENSE => LICENCE (76%) diff --git a/LICENSE b/LICENCE similarity index 76% rename from LICENSE rename to LICENCE index 00120f8f..b0b4be56 100644 --- a/LICENSE +++ b/LICENCE @@ -6,18 +6,22 @@ for their respective work, and release the work under the MIT licence Exceptions or notable authors are listed below in reverse chronological order: -* [LGPLv3] 2015-2016 Casper da Costa-Luis +* MPLv2.0 (text below) 2015-2016 (c) Casper da Costa-Luis [casperdcl](https://github.com/casperdcl). - An alternative [CC-BY-SA-4.0] licence is also available. -* MIT 2016 [PR #96] Google Inc. +* MIT 2016 (c) [PR #96] on behalf of Google Inc. - [LGPLv3]: http://www.gnu.org/licenses/lgpl-3.0.en.html - [CC-BY-SA-4.0]: http://creativecommons.org/licenses/by-sa/4.0/ [PR #96]: https://github.com/tqdm/tqdm/pull/96 -The MIT License (MIT) ---------------------- +Mozilla Public Licence (MPL) v. 2.0 - Exhibit A +----------------------------------------------- + +This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +If a copy of the MPL was not distributed with this file, You can obtain one at https://mozilla.org/MPL/2.0/. + + +MIT License (MIT) +----------------- Copyright (c) 2013 noamraph diff --git a/README.rst b/README.rst index 5921e17d..f61e48f2 100644 --- a/README.rst +++ b/README.rst @@ -549,7 +549,7 @@ file for more information. License ------- -Mostly `LGPLv3, MIT licence `__. A CC-BY-SA alternative is also available. +Multiple licences, mostly `MPLv2.0, MIT licences `__. Authors