RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

doc/developer: Add ISC license to list of acceptable licenses

This commit is contained in:
Diego Biurrun 2013-01-31 19:37:08 +01:00
parent cb30bf7f03
commit 8b0fda180e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/developer.texi
View File

@ -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.