From 785be94ddaab03bcf12152bec77f9d34635f29e3 Mon Sep 17 00:00:00 2001 From: "alqahira%ardisson.org" Date: Mon, 13 Jul 2009 01:26:13 +0000 Subject: [PATCH] Bug 495620 - License updates for Camino for cvs trunk. r=gerv, a/1.9.0.13=dveditz git-svn-id: svn://10.0.0.236/trunk@257687 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/toolkit/content/license.html | 59 ++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/mozilla/toolkit/content/license.html b/mozilla/toolkit/content/license.html index 5823817385d..6f9205452b8 100644 --- a/mozilla/toolkit/content/license.html +++ b/mozilla/toolkit/content/license.html @@ -169,6 +169,7 @@
  • Java Embedding Plugin License
  • jemalloc License
  • Lithuanian Spellchecking Dictionary
    • +
  • MAAttachedWindow
  • OpenVision License
  • Red Hat xdg_user_dir_lookup License
  • Russian Spellchecking Dictionary
    • @@ -1926,7 +1927,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    Breakpad License

    This license applies to files in the directory - toolkit/crashreporter/google-breakpad/.

    + toolkit/crashreporter/google-breakpad/ and + camino/google-breakpad/.

     Copyright (c) 2006, Google Inc.
@@ -2219,11 +2221,11 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
     
    This license applies to certain files in the directory
     toolkit/components/alerts/src/mac/growl/ and
-    camino/src/extensions/. (This code only ships in 
-    the Mac OS X version of the product.)
+    camino/growl/. (This code only ships in the Mac
+    OS X version of the product.)
 
 
    -Copyright (c) The Growl Project, 2004-2007
+Copyright (c) The Growl Project, 2004-2008
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -2374,6 +2376,55 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
    
 
 
+    
    
+
+    
    MAAttachedWindow License
    
+
+    
    This license applies to the files 
+    camino/src/extensions/MAAttachedWindow.h and
+    camino/src/extensions/MAAttachedWindow.mm. (This
+    code only ships in the Camino browser or products based on it.)
    
+
+
    +		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.
+
    
+
+
     
    
 
     
    OpenVision License