summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources/about_credits.html
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 17:07:17 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 17:07:17 +0000
commit5a224394f44fdfd9bf82ea58d5497b8d0551e113 (patch)
treec719c3c24a3f55de871f0565a0d5ca2d7df484d5 /chrome/browser/resources/about_credits.html
parent893c7a1de54c18e59ca9e4b87f0aa85c0140a344 (diff)
downloadchromium_src-5a224394f44fdfd9bf82ea58d5497b8d0551e113.zip
chromium_src-5a224394f44fdfd9bf82ea58d5497b8d0551e113.tar.gz
chromium_src-5a224394f44fdfd9bf82ea58d5497b8d0551e113.tar.bz2
Move Mozilla FTP LIST response parsing code to net/third_party directory.
This should make licensing terms and third-party origin of the code more clear. TEST=none BUG=none Review URL: http://codereview.chromium.org/179041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/about_credits.html')
-rw-r--r--chrome/browser/resources/about_credits.html42
1 files changed, 39 insertions, 3 deletions
diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html
index 23fd40d..bd61783 100644
--- a/chrome/browser/resources/about_credits.html
+++ b/chrome/browser/resources/about_credits.html
@@ -1307,11 +1307,11 @@ 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.1 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
-A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
details.
</p>
<p>You should have received a copy of the GNU Lesser General Public License
@@ -1323,5 +1323,41 @@ along with FFmpeg; if not, write to:</p>
</div>
</div>
+<!-- parseftp -->
+<div class="product">
+<span class="title">parseftp</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://mxr.mozilla.org/mozilla-central/source/netwerk/streamconv/converters/ParseFTPList.h">homepage</a></span>
+<div class="licence">
+<h3>parseftp is licensed as follows:</h3>
+<p>The contents of this file are subject to the Mozilla Public License Version
+1.1 (the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+http://www.mozilla.org/MPL/
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the
+License.</p>
+<p>The Original Code is mozilla.org Code.</p>
+<p>The Initial Developer of the Original Code is
+Cyrus Patel &lt;cyp@fb14.uni-mainz.de&gt;.
+Portions created by the Initial Developer are Copyright (C) 2002
+the Initial Developer. All Rights Reserved.</p>
+<p>Contributor(s):
+Doug Turner &lt;dougt@netscape.com&gt;</p>
+<p>Alternatively, the contents of this file may be used under the terms of
+either the GNU General Public License Version 2 or later (the "GPL"), or
+the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+in which case the provisions of the GPL or the LGPL are applicable instead
+of those above. If you wish to allow use of your version of this file only
+under the terms of either the GPL or the LGPL, and not to allow others to
+use your version of this file under the terms of the MPL, indicate your
+decision by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL or the LGPL. If you do not delete
+the provisions above, a recipient may use your version of this file under
+the terms of any one of the MPL, the GPL or the LGPL.</p>
+</div>
+</div>
+
</body>
</html>