[FFmpeg-cvslog] doc/developer: Add web links for all suggested licenses
Diego Biurrun
git at videolan.org
Fri Feb 1 14:24:09 CET 2013
ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Jan 31 19:34:37 2013 +0100| [cb30bf7f03ac1e2d8ae70e28cfe16beb9243604a] | committer: Diego Biurrun
doc/developer: Add web links for all suggested licenses
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cb30bf7f03ac1e2d8ae70e28cfe16beb9243604a
---
doc/developer.texi | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/doc/developer.texi b/doc/developer.texi
index f24b4fe..7c14f97 100644
--- a/doc/developer.texi
+++ b/doc/developer.texi
@@ -248,8 +248,11 @@ For Emacs, add these roughly equivalent lines to your @file{.emacs.d/init.el}:
@enumerate
@item
- Contributions should be licensed under the LGPL 2.1, including an
- "or any later version" clause, or the MIT license. GPL 2 including
+ 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}.
+ @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.
@item
More information about the ffmpeg-cvslog
mailing list