[FFmpeg-cvslog] doc/developer: Add ISC license to list of acceptable licenses

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Jan 31 19:37:08 2013 +0100| [8b0fda180e99bf64d485d3e1f1e3a13ee20d053a] | committer: Diego Biurrun

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8b0fda180e99bf64d485d3e1f1e3a13ee20d053a
---

 doc/developer.texi |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc/developer.texi b/doc/developer.texi
index 7c14f97..3f2c24d 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.