From 7edfa3f57d2792304854ab5309036d5cb0f0a567 Mon Sep 17 00:00:00 2001 From: "lpsolit%gmail.com" Date: Sun, 16 Mar 2008 20:48:36 +0000 Subject: [PATCH] Bug 421046: Remove GPL/LGPL options from any tri-licensed files - Patch by Gervase Markham r/a=mkanat git-svn-id: svn://10.0.0.236/trunk@247943 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/js/keyword-chooser.js | 14 +------------- .../en/default/bug/keyword-chooser.html.tmpl | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/mozilla/webtools/bugzilla/js/keyword-chooser.js b/mozilla/webtools/bugzilla/js/keyword-chooser.js index 3bbf1bee2eb..9440e588676 100644 --- a/mozilla/webtools/bugzilla/js/keyword-chooser.js +++ b/mozilla/webtools/bugzilla/js/keyword-chooser.js @@ -1,5 +1,5 @@ /* ***** BEGIN LICENSE BLOCK ***** - * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * Version: MPL 1.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 @@ -20,18 +20,6 @@ * Contributor(s): * Christopher A. Aillon (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 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 ***** */ function KeywordChooser(aParent, aChooser, aAvail, aChosen, aValidKeywords) diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/keyword-chooser.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/keyword-chooser.html.tmpl index c18087d74f3..b935bc08c54 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/keyword-chooser.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/keyword-chooser.html.tmpl @@ -1,5 +1,5 @@ [%# ***** BEGIN LICENSE BLOCK ***** - # Version: MPL 1.1/GPL 2.0/LGPL 2.1 + # Version: MPL 1.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 @@ -20,18 +20,6 @@ # Contributor(s): # Christopher A. Aillon (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 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 ***** #%]