From 94e2440963d2218db45cf06f1efacfe6bc9cd9df Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Mon, 27 Dec 2004 18:45:32 +0000 Subject: [PATCH] iBug 236613: change to MPL/LGPL/GPL tri-license. git-svn-id: svn://10.0.0.236/trunk@167048 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/db/sqlite3/src/Makefile.in | 2 + .../browser/cocoa/src/CHBrowserListener.h | 44 +++++++++++++--- mozilla/storage/Makefile.in | 2 + mozilla/storage/build/Makefile.in | 2 + mozilla/storage/test/Makefile.in | 2 + mozilla/widget/src/xlibxtbin/xlibxtbin.h | 50 +++++++++++++------ 6 files changed, 80 insertions(+), 22 deletions(-) diff --git a/mozilla/db/sqlite3/src/Makefile.in b/mozilla/db/sqlite3/src/Makefile.in index ac72b659df5..7b545e02642 100644 --- a/mozilla/db/sqlite3/src/Makefile.in +++ b/mozilla/db/sqlite3/src/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/embedding/browser/cocoa/src/CHBrowserListener.h b/mozilla/embedding/browser/cocoa/src/CHBrowserListener.h index 80950778e3b..483e331ac72 100644 --- a/mozilla/embedding/browser/cocoa/src/CHBrowserListener.h +++ b/mozilla/embedding/browser/cocoa/src/CHBrowserListener.h @@ -1,11 +1,39 @@ -// -// CHBrowserListener.h -// Chimera -// -// Created by Simon Fraser on Sat Aug 17 2002. -// Copyright (c) 2001 __MyCompanyName__. All rights reserved. -// - +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is Chimera. + * + * The Initial Developer of the Original Code is + * Simon Fraser. + * Portions created by the Initial Developer are Copyright (C) 2002 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ #ifndef __nsCocoaBrowserListener_h__ #define __nsCocoaBrowserListener_h__ diff --git a/mozilla/storage/Makefile.in b/mozilla/storage/Makefile.in index 19c027638c3..5c5bf7562da 100644 --- a/mozilla/storage/Makefile.in +++ b/mozilla/storage/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/storage/build/Makefile.in b/mozilla/storage/build/Makefile.in index 33f6b6dab7b..052db9c7cf7 100644 --- a/mozilla/storage/build/Makefile.in +++ b/mozilla/storage/build/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/storage/test/Makefile.in b/mozilla/storage/test/Makefile.in index 6876f7af45a..ce974474b1c 100644 --- a/mozilla/storage/test/Makefile.in +++ b/mozilla/storage/test/Makefile.in @@ -12,6 +12,8 @@ # for the specific language governing rights and limitations under the # License. # +# The Original Code is Oracle Corporation code. +# # The Initial Developer of the Original Code is # Oracle Corporation # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/widget/src/xlibxtbin/xlibxtbin.h b/mozilla/widget/src/xlibxtbin/xlibxtbin.h index 446a3331d77..4f8b0365976 100644 --- a/mozilla/widget/src/xlibxtbin/xlibxtbin.h +++ b/mozilla/widget/src/xlibxtbin/xlibxtbin.h @@ -1,20 +1,42 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- +/* widget -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * vim:ts=2:et:sw=2 */ + +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Peter Hartshorn. + * Portions created by the Initial Developer are Copyright (C) 2000 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Based on GtkXtBin by Rusty Lynch - 02/27/2000 + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ #ifndef __XLIB_XTBIN_H__ #define __XLIB_XTBIN_H__