Bug 553138 - Restore Camino Initial Developers to about:license, and add missing Camino-related license changes. r=gerv

toolkit/content/license.html

@@ -182,6 +182,7 @@
       <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>
@@ -761,6 +762,7 @@ under either the MPL or the [___] License."
 
 Aaron Leventhal,
 Aaron Nowack,
+Aaron Schulman,
 Aaron Train,
 ActiveState Tool Corp,
 Adam Barth,
@@ -780,6 +782,7 @@ Axel Hecht,
 Ben Bucksch,
 Ben Goodger,
 Ben Turner,
+Ben Willmore,
 Benjamin Smedberg,
 Berend Cornelius,
 Bernd Mielke,
@@ -794,16 +797,20 @@ 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,
@@ -818,6 +825,7 @@ Daniel Boelzle,
 Daniel Brooks,
 Daniel Glazman,
 Daniel Kouril,
+Daniel Weber,
 Daniel Witte,
 Dantifer Dang,
 Darin Fisher,
@@ -847,6 +855,7 @@ Frank Sch&ouml;nheit,
 Fred Jendrzejewski,
 Fredrik Holmqvist,
 Gavin Sharp,
+Geoff Beier,
 Gervase Markham,
 Gijs Kruitbosch,
 Giorgio Maone,
@@ -857,6 +866,7 @@ Heriot-Watt University,
 Hewlett-Packard Company,
 i-DNS.net International,
 Ian Hickson,
+Ian Leue,
 Ian Neal,
 Ian Oeschger,
 IBM Corporation,
@@ -871,6 +881,7 @@ Jan Wrobel,
 Jason Barnabe,
 Jason Orendorff,
 Jean-Francois Ducarroz,
+Jeff Dlouhy,
 Jeff Tsai,
 Jeff Walden,
 Jim Blandy,
@@ -913,6 +924,7 @@ Mark Mentovai,
 Markus G. Kuhn,
 Markus Stange,
 Mats Palmgren,
+Matt Judy,
 Matthew Willis,
 Merike Sell,
 Michael J. Fromberger,
@@ -963,6 +975,7 @@ Peter Weilbacher,
 Petr Kostka,
 Phil Ringnalda,
 Philipp Kewisch,
+Philippe Wittenbergh,
 Pierre Chanial,
 POTI Inc,
 Qualcomm Inc,
@@ -989,6 +1002,7 @@ Ryan VanderMeulen,
 Samphan Raruenrom,
 Scooter Morris,
 Scott MacGregor,
+Sean Murphy,
 Sebastian Schwieger,
 Sergei Dolgov,
 Seth Spitzer,
@@ -998,15 +1012,18 @@ 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,
@@ -2039,7 +2056,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     <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.
@@ -2487,8 +2505,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
     <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
@@ -2778,6 +2796,55 @@ SUCH DAMAGE.
 
 
 
+    <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>