From 49c6c3b8063e9d354a398a4f4fc63ecdfbe5bc44 Mon Sep 17 00:00:00 2001 From: "gerv%gerv.net" Date: Thu, 27 Jul 2006 14:27:10 +0000 Subject: [PATCH] Bug 236613: change to MPL/LGPL/GPL tri-license. --- .../content/viewers/jsObject/jsObjectViewer.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/extensions/inspector/resources/content/viewers/jsObject/jsObjectViewer.js b/extensions/inspector/resources/content/viewers/jsObject/jsObjectViewer.js index 8b9f5c0c788..652948e8ac0 100644 --- a/extensions/inspector/resources/content/viewers/jsObject/jsObjectViewer.js +++ b/extensions/inspector/resources/content/viewers/jsObject/jsObjectViewer.js @@ -1,10 +1,10 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * - * 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/ + * 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 @@ -13,7 +13,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Netscape Communications Corporation. * Portions created by the Initial Developer are Copyright (C) 2001 * the Initial Developer. All Rights Reserved. @@ -21,18 +21,17 @@ * Contributor(s): * Joe Hewitt (original author) * - * * 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 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 ***** */