1.1 --- a/toolkit/content/license.html 1.2 +++ b/toolkit/content/license.html 1.3 @@ -57,26 +57,26 @@ 1.4 <ul> 1.5 <li><a href="about:license#ACE">ACE License</a></li> 1.6 <li><a href="about:license#android">Android Open Source License</a></li> 1.7 <li><a href="about:license#angle">ANGLE License</a></li> 1.8 <li><a href="about:license#apache">Apache License 2.0</a></li> 1.9 <li><a href="about:license#apple">Apple License</a></li> 1.10 <li><a href="about:license#apple-mozilla">Apple/Mozilla NPRuntime License</a></li> 1.11 <li><a href="about:license#apple-torch">Apple/Torch Mobile License</a></li> 1.12 - <li><a href="about:license#breakpad">Breakpad License</a></li> 1.13 <li><a href="about:license#bspatch">bspatch License</a></li> 1.14 <li><a href="about:license#cairo">Cairo Component Licenses</a></li> 1.15 <li><a href="about:license#chromium">Chromium License</a></li> 1.16 <li><a href="about:license#dtoa">dtoa License</a></li> 1.17 <li><a href="about:license#hunspell-nl">Dutch Spellchecking Dictionary License</a></li> 1.18 <li><a href="about:license#edl">Eclipse Distribution License</a></li> 1.19 <li><a href="about:license#expat">Expat License</a></li> 1.20 <li><a href="about:license#firebug">Firebug License</a></li> 1.21 <li><a href="about:license#gfx-font-list">gfxFontList License</a></li> 1.22 + <li><a href="about:license#google-bsd">Google BSD License</a></li> 1.23 <li><a href="about:license#gears">Google Gears License</a></li> 1.24 <li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li> 1.25 <li><a href="about:license#vp8">Google VP8 License</a></li> 1.26 <li><a href="about:license#gyp">gyp License</a></li> 1.27 <li><a href="about:license#halloc">halloc License</a></li> 1.28 <li><a href="about:license#harfbuzz">HarfBuzz License</a></li> 1.29 <li><a href="about:license#icu">ICU License</a></li> 1.30 <li><a href="about:license#jpnic">Japan Network Information Center License</a></li> 1.31 @@ -596,16 +596,17 @@ executables of your software products. 1.32 1.33 1.34 <hr> 1.35 1.36 <h1><a id="android"></a>Android Open Source License</h1> 1.37 1.38 <p>This license applies to various files in the Mozilla codebase, 1.39 including those in the directory <span class="path">gfx/skia/</span>.</p> 1.40 +<!-- This is the wrong directory, what was intended? --> 1.41 1.42 <pre> 1.43 Copyright 2009, The Android Open Source Project 1.44 1.45 Redistribution and use in source and binary forms, with or without 1.46 modification, are permitted provided that the following conditions 1.47 are met: 1.48 * Redistributions of source code must retain the above copyright 1.49 @@ -964,56 +965,16 @@ PROFITS; OR BUSINESS INTERRUPTION) HOWEV 1.50 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 1.51 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 1.52 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 1.53 </pre> 1.54 1.55 1.56 <hr> 1.57 1.58 - <h1><a id="breakpad"></a>Breakpad License</h1> 1.59 - 1.60 - <p>This license applies to files in the directory 1.61 - <span class="path">toolkit/crashreporter/google-breakpad/</span> and 1.62 - <span class="path">camino/google-breakpad/</span>.</p> 1.63 - 1.64 -<pre> 1.65 -Copyright (c) 2006, Google Inc. 1.66 -All rights reserved. 1.67 - 1.68 -Redistribution and use in source and binary forms, with or without 1.69 -modification, are permitted provided that the following conditions are 1.70 -met: 1.71 - 1.72 - * Redistributions of source code must retain the above copyright 1.73 -notice, this list of conditions and the following disclaimer. 1.74 - * Redistributions in binary form must reproduce the above 1.75 -copyright notice, this list of conditions and the following disclaimer 1.76 -in the documentation and/or other materials provided with the 1.77 -distribution. 1.78 - * Neither the name of Google Inc. nor the names of its 1.79 -contributors may be used to endorse or promote products derived from 1.80 -this software without specific prior written permission. 1.81 - 1.82 -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 1.83 -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 1.84 -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 1.85 -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 1.86 -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 1.87 -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 1.88 -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 1.89 -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 1.90 -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 1.91 -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 1.92 -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 1.93 -</pre> 1.94 - 1.95 - 1.96 - <hr> 1.97 - 1.98 <h1><a id="bspatch"></a>bspatch License</h1> 1.99 1.100 <p>This license applies to the files 1.101 <span class="path">toolkit/mozapps/update/updater/bspatch.cpp</span> and 1.102 <span class="path">toolkit/mozapps/update/updater/bspatch.h</span>. 1.103 </p> 1.104 1.105 <pre> 1.106 @@ -1362,16 +1323,57 @@ ON ANY THEORY OF LIABILITY, WHETHER IN C 1.107 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 1.108 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 1.109 </pre> 1.110 1.111 1.112 1.113 <hr> 1.114 1.115 + <h1><a id="google-bsd"></a>Google BSD License</h1> 1.116 + 1.117 + <p>This license applies to files in the directories 1.118 + <span class="path">toolkit/crashreporter/google-breakpad/</span>, 1.119 + <span class="path">camino/google-breakpad/</span> and 1.120 + <span class="path">toolkit/components/protobuf/</span>.</p> 1.121 + 1.122 +<pre> 1.123 +Copyright (c) 2006, Google Inc. 1.124 +All rights reserved. 1.125 + 1.126 +Redistribution and use in source and binary forms, with or without 1.127 +modification, are permitted provided that the following conditions are 1.128 +met: 1.129 + 1.130 + * Redistributions of source code must retain the above copyright 1.131 +notice, this list of conditions and the following disclaimer. 1.132 + * Redistributions in binary form must reproduce the above 1.133 +copyright notice, this list of conditions and the following disclaimer 1.134 +in the documentation and/or other materials provided with the 1.135 +distribution. 1.136 + * Neither the name of Google Inc. nor the names of its 1.137 +contributors may be used to endorse or promote products derived from 1.138 +this software without specific prior written permission. 1.139 + 1.140 +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 1.141 +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 1.142 +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 1.143 +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 1.144 +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 1.145 +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 1.146 +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 1.147 +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 1.148 +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 1.149 +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 1.150 +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 1.151 +</pre> 1.152 + 1.153 + 1.154 + <hr> 1.155 + 1.156 <h1><a id="gears"></a>Google Gears License</h1> 1.157 1.158 <p>This license applies to the file 1.159 <span class="path">netwerk/wifi/wlanapi.h</span>.</p> 1.160 1.161 <pre> 1.162 Copyright 2008, Google Inc. 1.163 1.164 @@ -2644,17 +2646,17 @@ SUBSTITUTE GOODS OR SERVICES; LOSS OF US 1.165 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 1.166 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 1.167 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 1.168 POSSIBILITY OF SUCH DAMAGE. 1.169 </pre> 1.170 1.171 <hr> 1.172 1.173 - <h1><a id="skia"></a>SCTP Licenses</h1> 1.174 + <h1><a id="sctp"></a>SCTP Licenses</h1> 1.175 1.176 <p>These licenses apply to certain files in the directory 1.177 <span class="path">netwerk/sctp/src/</span>.</p> 1.178 1.179 <pre> 1.180 Copyright (c) 2009-2010 Brad Penoff 1.181 Copyright (c) 2009-2010 Humaira Kamal 1.182 Copyright (c) 2011-2012 Irene Ruengeler
Source: http://hg.mozilla.org/integration/mozilla-inbound/rev/ef0483c37e00
Dana Vollmer phillies phillies Ryan Dempster Phelps NBC Olympics Live Olympic medal count
No comments:
Post a Comment