diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-01-31 19:37:08 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-02-01 11:17:21 +0100 |
| commit | 8b0fda180e99bf64d485d3e1f1e3a13ee20d053a (patch) | |
| tree | 4d226074c4b7d589e8d5d11656ba951ae110d13c /doc/developer.texi | |
| parent | cb30bf7f03ac1e2d8ae70e28cfe16beb9243604a (diff) | |
| download | ffmpeg-8b0fda180e99bf64d485d3e1f1e3a13ee20d053a.tar.gz | |
doc/developer: Add ISC license to list of acceptable licenses
Diffstat (limited to 'doc/developer.texi')
| -rw-r--r-- | doc/developer.texi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 7c14f97cb1..3f2c24da6c 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -250,8 +250,10 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}: @item Contributions should be licensed under the @uref{http://www.gnu.org/licenses/lgpl-2.1.html, LGPL 2.1}, - including an "or any later version" clause, or the - @uref{http://mit-license.org/, MIT license}. + including an "or any later version" clause, or, if you prefer + a gift-style license, the + @uref{http://www.isc.org/software/license/, ISC} or + @uref{http://mit-license.org/, MIT} license. @uref{http://www.gnu.org/licenses/gpl-2.0.html, GPL 2} including an "or any later version" clause is also acceptable, but LGPL is preferred. |