diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-23 12:52:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-23 12:52:50 +0100 |
| commit | 5a8b4ed580e787d56364c5a2bdabeced6d771b07 (patch) | |
| tree | e7b47d6c160353db7be2336080f3d35ab83284a3 /doc | |
| parent | 5b4c7b7dcf933ccbab407ac71a950f791c707da0 (diff) | |
| parent | 57ead8449e44bd07b3d4a5bd42f1aab64566f92e (diff) | |
| download | ffmpeg-5a8b4ed580e787d56364c5a2bdabeced6d771b07.tar.gz | |
Merge commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e'
* commit '57ead8449e44bd07b3d4a5bd42f1aab64566f92e':
doc: fix link to the ISC license text in the developer documentation.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/developer.texi b/doc/developer.texi index 47a95aae35..1e1d3b8c8f 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -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 |