kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-19 10:45:16 -07:00
Code Issues Packages Projects Releases Wiki Activity

clarify LICENSE and README #899

Browse Source
This commit is contained in:
Justin M. Keyes 2014-06-27 18:32:58 -04:00
parent e4abb9e09a
commit 96ce391db9
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
LICENSE
View File

@ -1,5 +1,8 @@
Copyright Neovim contributors. All rights reserved. Copyright Neovim contributors. All rights reserved.
Neovim is licensed under the terms of the Apache 2.0 license, except for
parts of Neovim that were contributed under the Vim license (see below).
Neovim's license follows: Neovim's license follows:
==== ====
@ -180,9 +183,10 @@ Neovim's license follows:
==== ====
This license applies to all parts of Neovim that do not originate in Vim and The above license applies to all parts of Neovim except (1) parts that were
are not externally maintained libraries. The externally maintained libraries contributed under the Vim license and (2) externally maintained libraries.
used by Neovim are:
The externally maintained libraries used by Neovim are:
- Klib: a Generic Library in C. MIT/X11 license. - Klib: a Generic Library in C. MIT/X11 license.
- libuv. Copyright Joyent, Inc. and other Node contributors. - libuv. Copyright Joyent, Inc. and other Node contributors.
@ -190,7 +194,10 @@ used by Neovim are:
==== ====
Any parts of Neovim that originated in Vim are licensed under the Vim license. Any parts of Neovim that were contributed under the Vim license are licensed
under the Vim license unless the copyright holder gave permission to license
those contributions under the Apache 2.0 license.
The Vim license follows: The Vim license follows:
VIM LICENSE VIM LICENSE

14
README.md
View File

@ -73,8 +73,16 @@ Join the community on IRC in #neovim on Freenode or the [mailing list](https://g
### License ### License
Neovim is licensed under the terms of the Apache 2.0 License. Neovim is licensed under the terms of the Apache 2.0 license, except for
Parts of Neovim that originated in Vim remain under the Vim license. parts that were contributed under the Vim license.
- Contributions committed before [b17d96][license-commit] by authors who did
not sign the Contributor License Agreement (CLA) remain under the Vim license.
- Contributions committed after [b17d96][license-commit] are licensed under
Apache 2.0 unless those contributions were copied from Vim (identified in
the commit logs by the `vim-patch` token).
See LICENSE for details. See LICENSE for details.
Vim is Charityware. You can use and copy it as much as you like, but you are Vim is Charityware. You can use and copy it as much as you like, but you are
@ -88,4 +96,6 @@ See LICENSE for details.
You can also sponsor the development of Vim. Vim sponsors can vote for You can also sponsor the development of Vim. Vim sponsors can vote for
features. The money goes to Uganda anyway. features. The money goes to Uganda anyway.
[license-commit]: commit/b17d9691a24099c9210289f16afb1a498a89d803
<!-- vim: set tw=80: --> <!-- vim: set tw=80: -->