diff options
| author | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 01:07:52 +0000 |
|---|---|---|
| committer | mal@chromium.org <mal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 01:07:52 +0000 |
| commit | 9575747ca8ae9e706e6beefdde2ec69832258b5d (patch) | |
| tree | d43e88aa712cc5fb562bb71164b7eb012041a998 | |
| parent | 1bd60b967f1188197efff7011c332d46e2e5163c (diff) | |
| download | chromium_src-9575747ca8ae9e706e6beefdde2ec69832258b5d.zip chromium_src-9575747ca8ae9e706e6beefdde2ec69832258b5d.tar.gz chromium_src-9575747ca8ae9e706e6beefdde2ec69832258b5d.tar.bz2 | |
Correct the ffpmeg license disclosure:
1. The correct license is version 2_.1_ of the LGPL
2. The address is incorrect for the FSF.
I also corrected the address for the pthreads disclosure.
BUG=http://crbug.com/13147
Review URL: http://codereview.chromium.org/118099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17376 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/resources/about_credits.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html index b48d254..23fd40d 100644 --- a/chrome/browser/resources/about_credits.html +++ b/chrome/browser/resources/about_credits.html @@ -537,9 +537,8 @@ Igor Pavlov, as the author of this code, expressly permit you statically or dyna <p> You should have received a copy of the version 2.1 GNU Lesser General Public License with pthreads-win32; if not, write to:</p> <p> Free Software Foundation, Inc.<br> - 59 Temple Place<br> - Suite 330<br> - Boston, MA 02111-1307<br> + 51 Franklin Street, Fifth Floor<br> + Boston, MA 02111-1301<br> USA</p> <p> The contact addresses for pthreads-win32 is as follows: </p> <p> Web: <a href="http://sources.redhat.com/pthreads-win32" target="_blank">http://sources.redhat.com/pthreads-win32</a><br> @@ -1308,7 +1307,7 @@ Published: October 12, 2006 <h3>ffmpeg is licensed as follows:</h3> <p>FFmpeg is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software -Foundation; either version 2 of the License, or (at your option) any later +Foundation; either version 2.1 of the License, or (at your option) any later version.</p> <p>FFmpeg is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR @@ -1318,9 +1317,8 @@ details. <p>You should have received a copy of the GNU Lesser General Public License along with FFmpeg; if not, write to:</p> <p> Free Software Foundation, Inc.<br> - 59 Temple Place<br> - Suite 330<br> - Boston, MA 02111-1307<br> + 51 Franklin Street, Fifth Floor<br> + Boston, MA 02111-1301<br> USA</p> </div> </div> |