Bug 421046: Remove GPL/LGPL options from any tri-licensed files - Patch by Gervase...

diff --git a/js/keyword-chooser.js b/js/keyword-chooser.js
index 3bbf1bee2eb7df5c236a89494ce192c47229e2dd..9440e5886762d65dcead6ec3b6d6be261b392a36 100644 (file)
--- a/js/keyword-chooser.js
+++ b/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 <christopher@aillon.com> (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/template/en/default/bug/keyword-chooser.html.tmpl b/template/en/default/bug/keyword-chooser.html.tmpl
index c18087d74f38637816d1a31ee47d8c2231f33cf6..b935bc08c54588489c4f197849f735cc6478f122 100644 (file)
--- a/template/en/default/bug/keyword-chooser.html.tmpl
+++ b/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 <christopher@aillon.com> (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 *****
   #%]