[Android] Set Freetype credit
Geoffrey Métais
git at videolan.org
Wed Sep 27 15:51:11 CEST 2017
vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Wed Sep 27 15:34:51 2017 +0200| [8cbf1a0c073f86a0471726ee3824454b6d1f9c15] | committer: Geoffrey Métais
Set Freetype credit
> https://code.videolan.org/videolan/vlc-android/commit/8cbf1a0c073f86a0471726ee3824454b6d1f9c15
---
vlc-android/assets/licence.htm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/vlc-android/assets/licence.htm b/vlc-android/assets/licence.htm
index 883fcd695..1a561b2a2 100644
--- a/vlc-android/assets/licence.htm
+++ b/vlc-android/assets/licence.htm
@@ -21,7 +21,6 @@
<li>Android Open Source Project - Copyright © 2008 The Android Open Source Project - <a href="http://opensource.org/licenses/ISC">2-clause BSD license</a></li>
<li>FFmpeg/Libav - Copyright © 2000-2010 the FFmpeg developers - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
<li>FLAC - Copyright © 2001-2012 Josh Coalson et al. - codec libs <a href="#xiph">Xiph.org BSD license</a></li>
- <li>Freetype2 - Copyright © 2006-2011 by David Turner, Robert Wilhelm, and Werner Lemberg. - <a href="http://www.gnu.org/licenses/gpl-2.0.txt">GPL v2 or later</a></li>
<li>Fribidi - Copyright © Behdad Esfahbod - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
<li>GnuTLS - Copyright © 2000-2012 Free Software Foundation - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
<li>GOOM! - Copyright © 2000-2004 Jean-Christophe Hoelt - <a href="http://www.gnu.org/licenses/lgpl-2.1.txt">LGPL v2.1 or later</a></li>
@@ -723,6 +722,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that this notice is not removed and that neither the authors nor the Technische Universitaet Berlin are deemed to have made any representations as to the suitability of this software for any purpose nor are held responsible for any defects of this software. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE.
</p>
<p><a href="#top">Back to the top</a></p>
+<h3 id="ftl">FreeType Project LICENSE</h3>
+<p>Portions of this software are copyright ©2016 The FreeType Project (www.freetype.org). All rights reserved.</p>
+<p><a href="#top">Back to the top</a></p>
</body>
</html>
More information about the Android
mailing list