From: Diego Biurrun <diego@biurrun.de>
Date: Thu, 31 Jan 2013 18:37:08 +0000 (+0100)
Subject: doc/developer: Add ISC license to list of acceptable licenses
X-Git-Tag: android-x86-4.4-r1~364^2~1952
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8b0fda180e99bf64d485d3e1f1e3a13ee20d053a;p=android-x86%2Fexternal-ffmpeg.git

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

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.