[Android] About: small improvements for the licence section
Jean-Baptiste Kempf
git at videolan.org
Tue Jun 26 00:01:23 CEST 2012
android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jun 26 00:00:22 2012 +0200| [069354cba902a0ae690336f562a2be1511230fae] | committer: Jean-Baptiste Kempf
About: small improvements for the licence section
> http://git.videolan.org/gitweb.cgi/android.git/?a=commit;h=069354cba902a0ae690336f562a2be1511230fae
---
vlc-android/assets/licence.htm | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/vlc-android/assets/licence.htm b/vlc-android/assets/licence.htm
index efe17c4..7945a8f 100644
--- a/vlc-android/assets/licence.htm
+++ b/vlc-android/assets/licence.htm
@@ -1,15 +1,15 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- <title>VLC for Android licences</title>
- <meta http-equiv="content-type" content="text/html;charset=utf-8" />
+ <title>VLC for Android licences</title>
+ <meta http-equiv="content-type" content="text/html;charset=utf-8" />
</head>
<body id="top" style="background-color: #EBEBEE">
- <h1>VLC media player for Android</h1>
- <p>Copyright © 1996-2012 The VideoLAN team</p>
+ <h1>VLC for Android</h1>
+ <p>Copyleft © 1996-2012 VideoLAN, VLC authors</p>
<div>
<h2>Licence</h2>
<p>VLC for Android is licensed under the <a href="#gpl">GNU General Public License, version 3 or later</a> (herein referred to as GPL).</p>
@@ -19,10 +19,11 @@
<p>Some VLC plugins use external libraries and makes extensive use of the following persons' or companies' code:
<ul>
<li>ActionBarSherlock - Copyright © 2011-2012 Jake Wharton - <a href="http://www.apache.org/licenses/LICENSE-2.0.html">Apache 2.0</a></li>
- <li>FFmpeg/libav - Copyright © 2000-2010 the FFmpeg developers</li>
+ <li>FFmpeg/Libav - Copyright © 2000-2010 the FFmpeg developers</li>
<li>liba52 - Aaron Holtzman & Michel Lespinasse, et al.</li>
- <li>FAAD2</li>
- <li>Under construction</li>
+ <li>Flac - Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2007 Josh Coalson</li>
+ <li>Freetype</li>
+ <li>Fribidi</li>
</ul>
</p>
</div>
More information about the Android
mailing list