diff options
author | Pale Moon <git-repo@palemoon.org> | 2017-10-29 11:43:31 +0100 |
---|---|---|
committer | Pale Moon <git-repo@palemoon.org> | 2017-10-29 11:43:31 +0100 |
commit | 607fa4d3df6eda55a30c4dc63a64c2c9006fa835 (patch) | |
tree | 81297c0c613fad36972cb957a0cc957cf3d133bf | |
parent | fe81f2d0be07ff4205aab11414ead60a225e01fd (diff) | |
download | palemoon-607fa4d3df6eda55a30c4dc63a64c2c9006fa835.tar.gz |
Fix incorrect MPL 1.1 header in safemode dialog.
-rw-r--r-- | browser/base/content/safeMode.js | 40 | ||||
-rw-r--r-- | browser/base/content/safeMode.xul | 40 |
2 files changed, 7 insertions, 73 deletions
diff --git a/browser/base/content/safeMode.js b/browser/base/content/safeMode.js index cc3d89ea8..86c696dc8 100644 --- a/browser/base/content/safeMode.js +++ b/browser/base/content/safeMode.js @@ -1,41 +1,7 @@ # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.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 -# 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.org code. -# -# The Initial Developer of the Original Code is -# Mike Connor. -# Portions created by the Initial Developer are Copyright (C) 2005 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Mike Connor <mconnor@steelgryphon.com> -# Asaf Romano <mano@mozilla.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 ***** +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. Components.utils.import("resource://gre/modules/AddonManager.jsm"); diff --git a/browser/base/content/safeMode.xul b/browser/base/content/safeMode.xul index 846906a25..6dccd14f6 100644 --- a/browser/base/content/safeMode.xul +++ b/browser/base/content/safeMode.xul @@ -1,41 +1,9 @@ <?xml version="1.0"?> + # -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- -# ***** BEGIN LICENSE BLOCK ***** -# Version: MPL 1.1/GPL 2.0/LGPL 2.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 -# 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.org code. -# -# The Initial Developer of the Original Code is -# Mike Connor. -# Portions created by the Initial Developer are Copyright (C) 2005 -# the Initial Developer. All Rights Reserved. -# -# Contributor(s): -# Mike Connor <mconnor@steelgryphon.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 ***** +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. <!DOCTYPE prefwindow [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" > |