From 8f532dbe946d793894969b44597955b96cc0ee6d Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Thu, 11 Aug 2005 22:29:14 +0000 Subject: [PATCH] Bug 236613: change to MPL/LGPL/GPL tri-license. git-svn-id: svn://10.0.0.236/trunk@177602 18797224-902f-48f8-a5cc-f745e15eee43 --- .../pinstripe/global/nativescrollbars.css | 43 +++++++++++++------ .../themes/winstripe/global/xulscrollbars.css | 43 +++++++++++++------ 2 files changed, 58 insertions(+), 28 deletions(-) diff --git a/mozilla/toolkit/themes/pinstripe/global/nativescrollbars.css b/mozilla/toolkit/themes/pinstripe/global/nativescrollbars.css index aead8525b10..1c1677f3e51 100644 --- a/mozilla/toolkit/themes/pinstripe/global/nativescrollbars.css +++ b/mozilla/toolkit/themes/pinstripe/global/nativescrollbars.css @@ -1,25 +1,40 @@ -/* - * The contents of this file are subject to the Netscape 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/NPL/ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * 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 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 Mozilla Communicator client code, released * March 31, 1998. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 2002 Netscape Communications Corporation. All - * Rights Reserved. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 2002 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * Joe Hewitt (hewitt@netscape.com) - */ + * + * 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 ***** */ /* ===== scrollbars.css ================================================= == Styles used by native scrollbar-related elements. diff --git a/mozilla/toolkit/themes/winstripe/global/xulscrollbars.css b/mozilla/toolkit/themes/winstripe/global/xulscrollbars.css index ea19f936fea..2f9195392ab 100644 --- a/mozilla/toolkit/themes/winstripe/global/xulscrollbars.css +++ b/mozilla/toolkit/themes/winstripe/global/xulscrollbars.css @@ -1,25 +1,40 @@ -/* - * The contents of this file are subject to the Netscape 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/NPL/ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * 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 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 Mozilla Communicator client code, released * March 31, 1998. * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1998-2001 Netscape Communications Corporation. All - * Rights Reserved. + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998-2001 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * Joe Hewitt (hewitt@netscape.com) - */ + * + * 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 ***** */ /* ===== scrollbars.css ================================================= == Styles used by XUL scrollbar-related elements.