From 8df558232e421dc6606e3a23c608982df232da98 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Wed, 7 Nov 2007 05:10:40 +0000 Subject: [PATCH] Bug 236613: change to MPL/LGPL/GPL tri-license. git-svn-id: svn://10.0.0.236/trunk@238677 18797224-902f-48f8-a5cc-f745e15eee43 --- .../themes/gnomestripe/browser/pageInfo.css | 11 ++++++----- .../browser/preferences/preferences.css | 18 ++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/mozilla/browser/themes/gnomestripe/browser/pageInfo.css b/mozilla/browser/themes/gnomestripe/browser/pageInfo.css index a8177277164..7bd0838ccfc 100644 --- a/mozilla/browser/themes/gnomestripe/browser/pageInfo.css +++ b/mozilla/browser/themes/gnomestripe/browser/pageInfo.css @@ -1,9 +1,9 @@ /* ***** 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 + * 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, @@ -28,11 +28,12 @@ * 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 NPL, indicate your + * 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 NPL, the GPL or the LGPL. + * the terms of any one of the MPL, the GPL or the LGPL. + * * ***** END LICENSE BLOCK ***** */ @import "chrome://global/skin/"; diff --git a/mozilla/browser/themes/gnomestripe/browser/preferences/preferences.css b/mozilla/browser/themes/gnomestripe/browser/preferences/preferences.css index 193add74348..c6f3829bd6b 100644 --- a/mozilla/browser/themes/gnomestripe/browser/preferences/preferences.css +++ b/mozilla/browser/themes/gnomestripe/browser/preferences/preferences.css @@ -1,26 +1,28 @@ /* # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# ***** 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 the Firefox Preferences System. -# -# The Initial Developer of the Original Code is Ben Goodger. +# +# The Initial Developer of the Original Code is +# Ben Goodger. # Portions created by the Initial Developer are Copyright (C) 2005 # the Initial Developer. All Rights Reserved. -# +# # Contributor(s): # Ben Goodger -# +# # 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"), @@ -32,7 +34,7 @@ # 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 ***** */