summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 17:15:38 +0000
committerjoth@chromium.org <joth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-25 17:15:38 +0000
commit78c0468be50cd9747519b05ebcc4f46a8dacde76 (patch)
tree85c04e7804f9865de5a02c5ce3c01d18bb915d29
parent88ea7b1eeb6717bb993025afa25e9f80e382e891 (diff)
downloadchromium_src-78c0468be50cd9747519b05ebcc4f46a8dacde76.zip
chromium_src-78c0468be50cd9747519b05ebcc4f46a8dacde76.tar.gz
chromium_src-78c0468be50cd9747519b05ebcc4f46a8dacde76.tar.bz2
Add iStumbler license to the about:credits page
BUG=none TEST=none Review URL: http://codereview.chromium.org/660083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40027 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/about_credits.html37
1 files changed, 37 insertions, 0 deletions
diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html
index 6e0afdd..4c19dce 100644
--- a/chrome/browser/resources/about_credits.html
+++ b/chrome/browser/resources/about_credits.html
@@ -1358,5 +1358,42 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
</div>
</div>
+<!-- iStumbler -->
+<div class="product">
+<span class="title">iStumbler</span>
+<a class="show" href="#" onclick="return toggle(this);">show license</a>
+<span class="homepage"><a href="http://www.istumbler.net/">homepage</a></span>
+<div class="licence">
+<h3>iStumbler Apple80211.h is licensed as follows:</h3>
+<p>Copyright (c) 02006, Alf Watt &lt;<a
+href="mailto:alf@istumbler.net">alf@istumbler.net</a>&gt;. All rights
+reserved.</p>
+<p>Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:</p>
+<ol>
+<li>Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.</li>
+<li>Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.</li>
+<li>Neither the name of iStumbler nor the names of its contributors may
+be used to endorse or promote products derived from this software without
+specific prior written permission.</li>
+</ol>
+<p>THIS SOFTWARE IS PROVIDED BY THE AUTHOR &quot;AS IS&quot; AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</p>
+</div>
+</div>
+
+
</body>
</html>