fixes manually the file that the patch of bug 792717 could not change SEAMONKEY_2_16b1_BUILD1 SEAMONKEY_2_16b1_RELEASE SEAMONKEY_2_16b2_BUILD1 SEAMONKEY_2_16b2_RELEASE THUNDERBIRD_19_0b1_BUILD1 THUNDERBIRD_19_0b1_RELEASE
authorEduard Gamonal <edu@eduard-gamonal.net>
Sun, 06 Jan 2013 07:39:21 -0500
changeset 1179 6207dbd2a60b96ce9f06e1a13d46f074fee551c5
parent 1178 dd2aa517a909ea86a701150910375c3cba710d37
child 1185 aa34c666e860efec27ce1d3aa0f48d72d588df2b
child 1191 7fcbf0b3a7b2e7263a29b6bc210588dba0431359
child 1192 64a556f3e8e12f9bd2a2465973090d6e2d4f0154
child 1196 29eaec8be0dbaaad9b00738601eedcbf3b4b32ca
child 1215 efde863f1e8d011c065b7e5d6cfe91beb808505a
push id1
push usersledru@mozilla.com
push dateThu, 04 Dec 2014 21:43:21 +0000
bugs792717
fixes manually the file that the patch of bug 792717 could not change
extensions/irc/chrome/channels.dtd
--- a/extensions/irc/chrome/channels.dtd
+++ b/extensions/irc/chrome/channels.dtd
@@ -1,43 +1,11 @@
-<!-- ***** 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 ChatZilla.
-   -
-   - The Initial Developer of the Original Code is James Ross.
-   - Portions created by the Initial Developer are Copyright (C) 2004
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   James Ross <silver@warwickcompsoc.co.uk>
-   -
-   - 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 LGPL or the GPL. 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/. -->
 
 <!ENTITY window.title "Uneix-me al canal">
 
 <!ENTITY network.label     "Xarxa:">
 <!ENTITY network.accesskey "a">
 
 <!ENTITY channel.label     "Canal:">
 <!ENTITY channel.accesskey "C">