diff options
| author | lpsolit%gmail.com <> | 2008-03-17 02:48:08 +0100 |
|---|---|---|
| committer | lpsolit%gmail.com <> | 2008-03-17 02:48:08 +0100 |
| commit | 605076207b68ea30de0db7ec19bf8684aefc18e2 (patch) | |
| tree | 5bd44f4e44aca336d22ac12e879347f5a7a53226 | |
| parent | 05a0cfc3eeb0b738c7e00840df7b49e162692044 (diff) | |
| download | bugzilla-605076207b68ea30de0db7ec19bf8684aefc18e2.tar.gz bugzilla-605076207b68ea30de0db7ec19bf8684aefc18e2.tar.xz | |
Bug 421046: Remove GPL/LGPL options from any tri-licensed files - Patch by Gervase Markham <gerv@mozilla.org> r/a=mkanat
| -rw-r--r-- | js/keyword-chooser.js | 14 | ||||
| -rw-r--r-- | template/en/default/bug/keyword-chooser.html.tmpl | 14 |
2 files changed, 2 insertions, 26 deletions
diff --git a/js/keyword-chooser.js b/js/keyword-chooser.js index 3bbf1bee2..9440e5886 100644 --- 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 c18087d74..b935bc08c 100644 --- 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 ***** #%] |