Bug 553138 - Restore Camino Initial Developers to about:license, and add missing Camino-related license changes. r=gerv
authorSmokey Ardisson <alqahira@ardisson.org>
Tue, 08 Jun 2010 20:41:43 -0400
changeset 43348 6083525fa4beaf2dacf7cae577643961ffbbb908
parent 43347 d4e6501718f7b6816e0b5e52142a19805b2a6f47
child 43349 e5dd52dd3cb54a2f3b3315347f23f35c86d7b2f6
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerv
bugs553138
milestone1.9.3a5pre
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 553138 - Restore Camino Initial Developers to about:license, and add missing Camino-related license changes. r=gerv
toolkit/content/license.html
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -177,16 +177,17 @@
       <li><a href="about:license#halloc">halloc License</a></li>
       <li><a href="about:license#growl">Growl 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#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>
       <li><a href="about:license#hunspell-ru">Russian Spellchecking Dictionary License</a></li>
       <li><a href="about:license#sparkle">Sparkle License</a></li>
       <li><a href="about:license#sunsoft">SunSoft License</a></li>
       <li><a href="about:license#ucal">University of California License</a></li>      
       <li><a href="about:license#uszeged">University of Szeged License</a></li>      
@@ -756,16 +757,17 @@ under either the MPL or the [___] Licens
 <!-- This list created from mozilla-1.9.1 and comm-central on 2009-06-09.
      It was created using a modified version of the "relic" script in
      tools/relic, along with the make-id-list script in the same directory.
      See the comments in make-id-list for instructions on how to regenerate.
  -->    
 
 Aaron Leventhal,
 Aaron Nowack,
+Aaron Schulman,
 Aaron Train,
 ActiveState Tool Corp,
 Adam Barth,
 Adobe System Incorporated,
 Akkana Peck,
 Alex Fritze,
 Alexander J. Vincent,
 Alfred Peng,
@@ -775,54 +777,60 @@ Andrew Thompson,
 Andrew Zabolotny,
 ArentJan Banck,
 Arpad Borsos,
 Asaf Romano,
 Axel Hecht,
 Ben Bucksch,
 Ben Goodger,
 Ben Turner,
+Ben Willmore,
 Benjamin Smedberg,
 Berend Cornelius,
 Bernd Mielke,
 Bj&ouml;rn Jacke,
 Blake Ross,
 Blue Static,
 Boris Zbarsky,
 Brad Lassey,
 Bradley Baetz,
 Brendan Eich,
 Brian Birtles,
 Brian Bober,
 Brian Crowder,
 Brian Ryner,
+Bruce Davidson,
 Bruno Browning,
 Bruno Escherl,
 Bruno Haible,
+Bryan Atwood,
 Caio Tiago Oliveira,
+Calum Robinson,
 Chinmay Deepakbhai Patel,
 Chris Double,
 Chris McAfee,
 Christian Biesinger,
 Christopher A. Aillon,
 Christopher Blizzard,
+Christopher Henderson,
 Christopher Hoess,
 Christopher Seawood,
 Craig Topper,
 Crocodile Clips Ltd,
 CSIRO,
 Cyrus Patel,
 D&atilde;o Gottwald,
 Dainis Jonitis,
 Dan Mosedale,
 Dan Schaffer,
 Daniel Boelzle,
 Daniel Brooks,
 Daniel Glazman,
 Daniel Kouril,
+Daniel Weber,
 Daniel Witte,
 Dantifer Dang,
 Darin Fisher,
 Dave Liebreich,
 Dave Townsend,
 David Ascher,
 David Bienvenu,
 David Bradley,
@@ -842,40 +850,43 @@ Elika J. Etemad,
 Eric Belhaire,
 Eric Hodel,
 Esben Mose Hansen,
 Florian Queze,
 Frank Sch&ouml;nheit,
 Fred Jendrzejewski,
 Fredrik Holmqvist,
 Gavin Sharp,
+Geoff Beier,
 Gervase Markham,
 Gijs Kruitbosch,
 Giorgio Maone,
 Google Inc,
 Graeme McCutcheon,
 H&aring;kan Waara,
 Heriot-Watt University,
 Hewlett-Packard Company,
 i-DNS.net International,
 Ian Hickson,
+Ian Leue,
 Ian Neal,
 Ian Oeschger,
 IBM Corporation,
 Igor Bukanov,
 InnoTek Systemberatung GmbH,
 Intel Corporation,
 James Boston,
 James L. Nance,
 Jamie Zawinski,
 Jan Varga,
 Jan Wrobel,
 Jason Barnabe,
 Jason Orendorff,
 Jean-Francois Ducarroz,
+Jeff Dlouhy,
 Jeff Tsai,
 Jeff Walden,
 Jim Blandy,
 Jim Mathies,
 Joe Hewitt,
 Joey Minta,
 John B. Keiser,
 John C. Griggs,
@@ -908,16 +919,17 @@ Marc Bevand,
 Marco Pesenti Gritti,
 Mark 'Mook' Yen,
 Mark Banner,
 Mark Finkle,
 Mark Mentovai,
 Markus G. Kuhn,
 Markus Stange,
 Mats Palmgren,
+Matt Judy,
 Matthew Willis,
 Merike Sell,
 Michael J. Fromberger,
 Michael Johnston,
 Michael Kohler,
 Michael Kraft,
 Michael Ventnor,
 Michal Ceresna,
@@ -958,16 +970,17 @@ Paul Kocher,
 Paul Sandoz,
 Paul Tomlin,
 Peter Annema,
 Peter Van der Beken,
 Peter Weilbacher,
 Petr Kostka,
 Phil Ringnalda,
 Philipp Kewisch,
+Philippe Wittenbergh,
 Pierre Chanial,
 POTI Inc,
 Qualcomm Inc,
 R.J. Keller,
 Rajiv Dayal,
 Ramalingam Saravanan,
 Red Hat Inc,
 Rich Salz,
@@ -984,34 +997,38 @@ Robert Sayre,
 Robert Strong,
 Roland Mainz,
 RSA Security Inc,
 Ryan Cassin,
 Ryan VanderMeulen,
 Samphan Raruenrom,
 Scooter Morris,
 Scott MacGregor,
+Sean Murphy,
 Sebastian Schwieger,
 Sergei Dolgov,
 Seth Spitzer,
 Shawn Wilsher,
 Shy Shalom,
 Siddharth Agarwal,
 Simdesk Technologies Inc,
 Simmule Turner,
 Simon B&uuml;nzli,
+Simon Fraser,
 Simon Montagu,
 Simon Paquet,
 Simon Wilkinson,
+Smokey Ardisson,
 Sqlite Project,
 Srilatha Moturi,
 Stanford University,
 Stefan Sitter,
 Stephen Horlander,
 Steve Swanson,
+Stuart Morgan,
 Stuart Parmenter,
 Sun Microsystems Inc,
 Sylvain Pasche,
 Taras Glek,
 Ted Mielczarek,
 Theppitak Karoonboonyanan,
 Thomas K. Dyas,
 Tim Copperfield,
@@ -2034,17 +2051,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 </pre>
 
 
     <hr>
 
     <h1><a name="breakpad"></a>Breakpad License</h1>
 
     <p class="correctme">This license applies to files in the directory 
-    <span class="path">toolkit/crashreporter/google-breakpad/</span>.</p>
+    <span class="path">toolkit/crashreporter/google-breakpad/</span> and
+    <span class="path">camino/google-breakpad/</span>.</p>
 
 <pre>
 Copyright (c) 2006, Google Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:
@@ -2482,18 +2500,18 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
 
 
     <hr>
 
     <h1><a name="growl"></a>Growl License</h1>
 
     <p class="correctme">This license applies to certain files in the directory
     <span class="path">toolkit/components/alerts/src/mac/growl/</span> and
-    <span class="path">camino/src/extensions/</span>. (This code only ships in 
-    the Mac OS X version of the product.)
+    <span class="path">camino/growl/</span>. (This code only ships in the Mac
+    OS X version of the product.)
 
 <pre>
 Copyright (c) The Growl Project, 2004-2009
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
 
@@ -2775,16 +2793,65 @@ LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 </pre>
 
 
 
     <hr>
 
+    <h1><a name="maattachedwindow"></a>MAAttachedWindow License</h1>
+
+    <p class="correctme">This license applies to the files 
+    <span class="path">camino/src/extensions/MAAttachedWindow.h</span> and
+    <span class="path">camino/src/extensions/MAAttachedWindow.mm</span>. (This
+    code only ships in the Camino browser or products based on it.)</p>
+
+<pre>
+		This software is supplied to you by Matt Gemmell in consideration of
+your agreement to the following terms, and your use, installation, modification
+or redistribution of this software constitutes acceptance of these terms. If
+you do not agree with these terms, please do not use, install, modify or
+redistribute this software.
+
+		In consideration of your agreement to abide by the following terms, and
+subject to these terms, Matt Gemmell grants you a personal, non-exclusive
+license, to use, reproduce, modify and redistribute the software, with or
+without modifications, in source and/or binary forms; provided that if you
+redistribute the software in its entirety and without modifications, you must
+retain this notice and the following text and disclaimers in all such
+redistributions of the software, and that in all cases attribution of Matt
+Gemmell as the original author of the source code shall be included in all such
+resulting software products or distributions.
+Neither the name, trademarks, service marks or logos of Matt Gemmell may be
+used to endorse or promote products derived from the software without specific
+prior written permission from Matt Gemmell. Except as expressly stated in this
+notice, no other rights or licenses, express or implied, are granted by Matt
+Gemmell herein, including but not limited to any patent rights that may be
+infringed by your derivative works or by other works in which the software may
+be incorporated.
+
+		The software is provided by Matt Gemmell on an "AS IS" basis. MATT
+GEMMELL MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE, REGARDING THE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN
+COMBINATION WITH YOUR PRODUCTS.
+
+		IN NO EVENT SHALL MATT GEMMELL BE LIABLE FOR ANY SPECIAL, INDIRECT,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION
+AND/OR DISTRIBUTION OF THE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF
+CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF
+MATT GEMMELL HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+</pre>
+
+
+    <hr>
+
     <h1><a name="openvision"></a>OpenVision License</h1>
 
     <p class="correctme">This license applies to the file 
     <span class="path">extensions/auth/gssapi.h</span>.</p>
 
 <pre>
 Copyright 1993 by OpenVision Technologies, Inc.