Skip to content

Commit

Permalink
MPL
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl committed Feb 17, 2016
1 parent ed5522c commit dae8f31
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
18 changes: 11 additions & 7 deletions LICENSE → LICENCE
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Expand Up @@ -549,7 +549,7 @@ file for more information.
License
-------

Mostly `LGPLv3, MIT licence <https://raw.githubusercontent.com/tqdm/tqdm/master/LICENSE>`__. A CC-BY-SA alternative is also available.
Multiple licences, mostly `MPLv2.0, MIT licences <https://raw.githubusercontent.com/tqdm/tqdm/master/LICENSE>`__.


Authors
Expand Down

0 comments on commit dae8f31

Please sign in to comment.