Commit 5a8b4ed5 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '57ead844'

* commit '57ead844':
  doc: fix link to the ISC license text in the developer documentation.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 5b4c7b7d 57ead844
......@@ -248,7 +248,7 @@ 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, if you prefer
a gift-style license, the
@uref{http://www.isc.org/software/license/, ISC} or
@uref{http://opensource.org/licenses/isc-license.txt, 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment