Bug 578686: Add jQuery license to about:license. r=gerv
authorSteffen Wilberg <steffen.wilberg@web.de>
Fri, 16 Jul 2010 21:36:47 +0200
changeset 47834 8d24f5eb3cfcb6e5071a9f158867546fd1b7660f
parent 47833 467e61c0ca2488a4e7503d8d32f7098c955c738d
child 47835 33dd9ef7f7ebcf8fb075ece63a7bcacf4968a292
push id14436
push usersteffen.wilberg@web.de
push dateFri, 16 Jul 2010 19:46:33 +0000
treeherderautoland@8d24f5eb3cfc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs578686
milestone2.0b2pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 578686: Add jQuery license to about:license. r=gerv
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -175,16 +175,17 @@
       <li><a href="about:license#gears-istumbler">Google Gears/iStumbler License</a></li>
       <li><a href="about:license#vp8">Google VP8 License</a></li>
       <li><a href="about:license#growl">Growl License</a></li>
       <li><a href="about:license#halloc">halloc License</a></li>
       <li><a href="about:license#harfbuzz">HarfBuzz License</a></li>
       <li><a href="about:license#icu">ICU License</a></li>
       <li><a href="about:license#jpnic">Japan Network Information Center License</a></li>
       <li><a href="about:license#jemalloc">jemalloc License</a></li>
+      <li><a href="about:license#jquery">jQuery License</a></li>
       <li><a href="about:license#libevent">libevent License</a></li>
       <li><a href="about:license#libffi">libffi License</a></li>
       <li><a href="about:license#libnestegg">libnestegg License</a></li>
       <li><a href="about:license#hunspell-lt">Lithuanian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#maattachedwindow">MAAttachedWindow</a></li>
       <li><a href="about:license#openvision">OpenVision License</a></li>
       <li><a href="about:license#qcms">qcms License</a></li>
       <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li>
@@ -2745,19 +2746,48 @@ LIABLE FOR ANY DIRECT, INDIRECT, INCIDEN
 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.
 </pre>
 
+    <hr>
+
+    <h1><a name="jquery"></a>jQuery License</h1>
+
+    <p class="correctme">This license applies to files in the directory
+      <span class="path">mail/jquery/</span>. (This code only ships in the
+      Thunderbird messaging software or products based on it.)</p>
+
+<pre>
+Copyright (c) 2010 John Resig, http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</pre>
 
     <hr>
-    
 
     <h1><a name="libevent"></a>libevent License</h1>
 
     <p class="correctme">This license applies to files in the directory
     <span class="path">ipc/chromium/src/third_party/libevent/</span>.
     </p>
 
 <pre>
@@ -3071,17 +3101,17 @@ POSSIBILITY OF SUCH DAMAGE.
 
 
     <hr>
 
     <h1><a name="sparkle"></a>Sparkle License</h1>
 
     <p class="correctme">This license applies to certain files in the directory
     <span class="path">camino/sparkle/</span>. (This code only ships in the
-    in the Camino browser or products based on it.)</p>
+    Camino browser or products based on it.)</p>
 
 <pre>
 Copyright (c) 2006 Andy Matuschak
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
 use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of