diff --git a/mozilla/config/WIN16 b/mozilla/config/WIN16
index 3079b5b46a5..2500ff68e03 100644
--- a/mozilla/config/WIN16
+++ b/mozilla/config/WIN16
@@ -1,21 +1,38 @@
-# The contents of this file are subject to the Netscape 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/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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 Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s):
+# Contributor(s):
+#
+# 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 *****
#//------------------------------------------------------------------------
#//
diff --git a/mozilla/config/WIN32 b/mozilla/config/WIN32
index 3415743a2fe..95580384275 100644
--- a/mozilla/config/WIN32
+++ b/mozilla/config/WIN32
@@ -1,12 +1,15 @@
-# The contents of this file are subject to the Netscape 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/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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.
#
@@ -15,7 +18,21 @@
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
-# Contributor(s):
+# Contributor(s):
+#
+# 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 *****
#//------------------------------------------------------------------------
#//
diff --git a/mozilla/config/buildpkg.bat b/mozilla/config/buildpkg.bat
index 1ccd2bb1aeb..a2422880ad9 100644
--- a/mozilla/config/buildpkg.bat
+++ b/mozilla/config/buildpkg.bat
@@ -1,22 +1,39 @@
@echo off
-rem The contents of this file are subject to the Netscape Public
-rem License Version 1.1 (the "License"); you may not use this file
-rem except in compliance with the License. You may obtain a copy of
-rem the License at http://www.mozilla.org/NPL/
-rem
-rem Software distributed under the License is distributed on an "AS
-rem IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-rem implied. See the License for the specific language governing
-rem rights and limitations under the License.
-rem
-rem The Original Code is mozilla.org code.
-rem
-rem The Initial Developer of the Original Code is Netscape
-rem Communications Corporation. Portions created by Netscape are
-rem Copyright (C) 1998 Netscape Communications Corporation. All
-rem Rights Reserved.
-rem
-rem Contributor(s):
+REM ***** BEGIN LICENSE BLOCK *****
+REM Version: MPL 1.1/GPL 2.0/LGPL 2.1
+REM
+REM The contents of this file are subject to the Mozilla Public License Version
+REM 1.1 (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM http://www.mozilla.org/MPL/
+REM
+REM Software distributed under the License is distributed on an "AS IS" basis,
+REM WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+REM for the specific language governing rights and limitations under the
+REM License.
+REM
+REM The Original Code is mozilla.org code.
+REM
+REM The Initial Developer of the Original Code is
+REM Netscape Communications Corporation.
+REM Portions created by the Initial Developer are Copyright (C) 1998
+REM the Initial Developer. All Rights Reserved.
+REM
+REM Contributor(s):
+REM
+REM Alternatively, the contents of this file may be used under the terms of
+REM either the GNU General Public License Version 2 or later (the "GPL"), or
+REM the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+REM in which case the provisions of the GPL or the LGPL are applicable instead
+REM of those above. If you wish to allow use of your version of this file only
+REM under the terms of either the GPL or the LGPL, and not to allow others to
+REM use your version of this file under the terms of the MPL, indicate your
+REM decision by deleting the provisions above and replace them with the notice
+REM and other provisions required by the GPL or the LGPL. If you do not delete
+REM the provisions above, a recipient may use your version of this file under
+REM the terms of any one of the MPL, the GPL or the LGPL.
+REM
+REM ***** END LICENSE BLOCK *****
@echo on
@echo off
diff --git a/mozilla/config/dll.inc b/mozilla/config/dll.inc
index dae19a89664..0ee75ac80f5 100644
--- a/mozilla/config/dll.inc
+++ b/mozilla/config/dll.inc
@@ -1,21 +1,39 @@
-# The contents of this file are subject to the Netscape 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/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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 Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s):
+# Contributor(s):
+#
+#
+# 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 *****
!if !defined(VERBOSE)
.SILENT:
diff --git a/mozilla/config/exe.inc b/mozilla/config/exe.inc
index 1b1566e2b3d..5468a01ec54 100644
--- a/mozilla/config/exe.inc
+++ b/mozilla/config/exe.inc
@@ -1,21 +1,38 @@
-# The contents of this file are subject to the Netscape 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/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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 Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s):
+# Contributor(s):
+#
+# 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 *****
!if !defined(VERBOSE)
.SILENT:
diff --git a/mozilla/config/install.bat b/mozilla/config/install.bat
index d9108dfb341..215ab298029 100644
--- a/mozilla/config/install.bat
+++ b/mozilla/config/install.bat
@@ -1,22 +1,40 @@
@echo off
-rem The contents of this file are subject to the Netscape Public
-rem License Version 1.1 (the "License"); you may not use this file
-rem except in compliance with the License. You may obtain a copy of
-rem the License at http://www.mozilla.org/NPL/
+rem ***** BEGIN LICENSE BLOCK *****
+rem Version: MPL 1.1/GPL 2.0/LGPL 2.1
rem
-rem Software distributed under the License is distributed on an "AS
-rem IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-rem implied. See the License for the specific language governing
-rem rights and limitations under the License.
+rem The contents of this file are subject to the Mozilla Public License Version
+rem 1.1 (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem http://www.mozilla.org/MPL/
+rem
+rem Software distributed under the License is distributed on an "AS IS" basis,
+rem WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+rem for the specific language governing rights and limitations under the
+rem License.
rem
rem The Original Code is mozilla.org code.
rem
-rem The Initial Developer of the Original Code is Netscape
-rem Communications Corporation. Portions created by Netscape are
-rem Copyright (C) 1998 Netscape Communications Corporation. All
-rem Rights Reserved.
+rem The Initial Developer of the Original Code is
+rem Netscape Communications Corporation.
+rem Portions created by the Initial Developer are Copyright (C) 1998
+rem the Initial Developer. All Rights Reserved.
rem
-rem Contributor(s):
+rem Contributor(s):
+rem
+rem Alternatively, the contents of this file may be used under the terms of
+rem either the GNU General Public License Version 2 or later (the "GPL"), or
+rem the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+rem in which case the provisions of the GPL or the LGPL are applicable instead
+rem of those above. If you wish to allow use of your version of this file only
+rem under the terms of either the GPL or the LGPL, and not to allow others to
+rem use your version of this file under the terms of the MPL, indicate your
+rem decision by deleting the provisions above and replace them with the notice
+rem and other provisions required by the GPL or the LGPL. If you do not delete
+rem the provisions above, a recipient may use your version of this file under
+rem the terms of any one of the MPL, the GPL or the LGPL.
+rem
+rem ***** END LICENSE BLOCK ***** */
+
@echo on
@if not exist %2\nul mkdir %2
diff --git a/mozilla/config/java.inc b/mozilla/config/java.inc
index 33084b3456f..28cc1f2b174 100644
--- a/mozilla/config/java.inc
+++ b/mozilla/config/java.inc
@@ -1,21 +1,38 @@
-# The contents of this file are subject to the Netscape 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/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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 Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s):
+# Contributor(s):
+#
+# 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 *****
!if !defined(VERBOSE)
.SILENT:
diff --git a/mozilla/config/lib.inc b/mozilla/config/lib.inc
index a4f17f30c63..eb5e670a4df 100644
--- a/mozilla/config/lib.inc
+++ b/mozilla/config/lib.inc
@@ -1,21 +1,38 @@
-# The contents of this file are subject to the Netscape 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/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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 Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
+#
+# 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 *****
!if !defined(VERBOSE)
.SILENT:
diff --git a/mozilla/config/obj.inc b/mozilla/config/obj.inc
index 59f87cab07d..57602c8e793 100644
--- a/mozilla/config/obj.inc
+++ b/mozilla/config/obj.inc
@@ -1,12 +1,15 @@
-# The contents of this file are subject to the Netscape 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/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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.
#
@@ -15,7 +18,21 @@
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
-# Contributor(s):
+# Contributor(s):
+#
+# 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 *****
!if !defined(VERBOSE)
.SILENT:
diff --git a/mozilla/config/true.bat b/mozilla/config/true.bat
index 976b54f5003..a8c71d7c173 100644
--- a/mozilla/config/true.bat
+++ b/mozilla/config/true.bat
@@ -1,22 +1,40 @@
@echo off
-rem The contents of this file are subject to the Netscape Public
-rem License Version 1.1 (the "License"); you may not use this file
-rem except in compliance with the License. You may obtain a copy of
-rem the License at http://www.mozilla.org/NPL/
+rem ***** BEGIN LICENSE BLOCK *****
+rem Version: MPL 1.1/GPL 2.0/LGPL 2.1
rem
-rem Software distributed under the License is distributed on an "AS
-rem IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-rem implied. See the License for the specific language governing
-rem rights and limitations under the License.
+rem The contents of this file are subject to the Mozilla Public License Version
+rem 1.1 (the "License"); you may not use this file except in compliance with
+rem the License. You may obtain a copy of the License at
+rem http://www.mozilla.org/MPL/
+rem
+rem Software distributed under the License is distributed on an "AS IS" basis,
+rem WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+rem for the specific language governing rights and limitations under the
+rem License.
rem
rem The Original Code is mozilla.org code.
rem
-rem The Initial Developer of the Original Code is Netscape
-rem Communications Corporation. Portions created by Netscape are
-rem Copyright (C) 1998 Netscape Communications Corporation. All
-rem Rights Reserved.
+rem The Initial Developer of the Original Code is
+rem Netscape Communications Corporation.
+rem Portions created by the Initial Developer are Copyright (C) 1998
+rem the Initial Developer. All Rights Reserved.
rem
-rem Contributor(s):
+rem Contributor(s):
+rem
+rem Alternatively, the contents of this file may be used under the terms of
+rem either the GNU General Public License Version 2 or later (the "GPL"), or
+rem the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+rem in which case the provisions of the GPL or the LGPL are applicable instead
+rem of those above. If you wish to allow use of your version of this file only
+rem under the terms of either the GPL or the LGPL, and not to allow others to
+rem use your version of this file under the terms of the MPL, indicate your
+rem decision by deleting the provisions above and replace them with the notice
+rem and other provisions required by the GPL or the LGPL. If you do not delete
+rem the provisions above, a recipient may use your version of this file under
+rem the terms of any one of the MPL, the GPL or the LGPL.
+rem
+rem ***** END LICENSE BLOCK ***** */
+
@echo on
@echo off
diff --git a/mozilla/content/xml/content/src/xhtml11.dtd b/mozilla/content/xml/content/src/xhtml11.dtd
index a6b14a41338..b3e360cbe20 100644
--- a/mozilla/content/xml/content/src/xhtml11.dtd
+++ b/mozilla/content/xml/content/src/xhtml11.dtd
@@ -1,23 +1,39 @@
-
+
+
+
diff --git a/mozilla/editor/ui/composer/content/EditorInitPage.html b/mozilla/editor/ui/composer/content/EditorInitPage.html
index 51200d9efe6..65e66198124 100644
--- a/mozilla/editor/ui/composer/content/EditorInitPage.html
+++ b/mozilla/editor/ui/composer/content/EditorInitPage.html
@@ -1,24 +1,38 @@
-
+
diff --git a/mozilla/editor/ui/composer/content/EditorInitPagePlain.html b/mozilla/editor/ui/composer/content/EditorInitPagePlain.html
index ed4e726e116..67524105009 100644
--- a/mozilla/editor/ui/composer/content/EditorInitPagePlain.html
+++ b/mozilla/editor/ui/composer/content/EditorInitPagePlain.html
@@ -1,24 +1,39 @@
-
+
diff --git a/mozilla/editor/ui/dialogs/content/EdImageMapPage.html b/mozilla/editor/ui/dialogs/content/EdImageMapPage.html
index 6bf594ddd9e..d7ac8325855 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageMapPage.html
+++ b/mozilla/editor/ui/dialogs/content/EdImageMapPage.html
@@ -1,27 +1,41 @@
-
+
diff --git a/mozilla/embedding/browser/cocoa/src/CHClickListener.mm b/mozilla/embedding/browser/cocoa/src/CHClickListener.mm
index da70b3cd326..e94163123ee 100644
--- a/mozilla/embedding/browser/cocoa/src/CHClickListener.mm
+++ b/mozilla/embedding/browser/cocoa/src/CHClickListener.mm
@@ -1,11 +1,11 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * The contents of this file are subject to the Netscape 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/NPL/
+ * 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
@@ -14,25 +14,25 @@
*
* The Original Code is mozilla.org code.
*
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2002
- * the Initial Developer. All Rights Reserved.
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2002 Netscape Communications Corporation. All
+ * Rights Reserved.
*
* Contributor(s):
* David Hyatt (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
+ * 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/mozilla/embedding/browser/gtk/src/EmbedComponents.cpp.in b/mozilla/embedding/browser/gtk/src/EmbedComponents.cpp.in
index 76fc0213120..20a26614418 100644
--- a/mozilla/embedding/browser/gtk/src/EmbedComponents.cpp.in
+++ b/mozilla/embedding/browser/gtk/src/EmbedComponents.cpp.in
@@ -1,26 +1,42 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; 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/
+ * 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.
+ * 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 Netscape Communications
- * Corporation. Portions created by Netscape are
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation. Portions created by Netscape are
* Copyright (C) 2001 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Christopher Seawood
* Chris Waterson
- */
+ *
+ * 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 ***** */
#line 26 "nsStaticComponents.cpp.in"
#define XPCOM_TRANSLATE_NSGM_ENTRY_POINT 1
diff --git a/mozilla/embedding/componentlib/nsMetaModule.cpp.in b/mozilla/embedding/componentlib/nsMetaModule.cpp.in
index 2710bc2b6d2..3e608981102 100644
--- a/mozilla/embedding/componentlib/nsMetaModule.cpp.in
+++ b/mozilla/embedding/componentlib/nsMetaModule.cpp.in
@@ -1,27 +1,41 @@
-/* -*- Mode: C++; 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 Netscape 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/NPL/
+ * 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.
+ * 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 Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Christopher Seawood
+ * Christopher Seawood
* Doug Turner
* Chris Waterson
- */
+ *
+ * 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 ***** */
#line 27 "nsMetaModule.cpp.in"
#include "nsError.h"
diff --git a/mozilla/embedding/qa/jstests/ComponentListTest.txt b/mozilla/embedding/qa/jstests/ComponentListTest.txt
index 99909a69663..f2fc31dcd72 100644
--- a/mozilla/embedding/qa/jstests/ComponentListTest.txt
+++ b/mozilla/embedding/qa/jstests/ComponentListTest.txt
@@ -1,19 +1,15 @@
-
-
- Component List
-
+
+
+
+ Component List
+
diff --git a/mozilla/embedding/qa/jstests/EmbedSmokeTest.txt b/mozilla/embedding/qa/jstests/EmbedSmokeTest.txt
index e49d8cd9ab5..74519e5a549 100644
--- a/mozilla/embedding/qa/jstests/EmbedSmokeTest.txt
+++ b/mozilla/embedding/qa/jstests/EmbedSmokeTest.txt
@@ -1,29 +1,41 @@
Embed Smoke Test
-
+ -
+ - 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 ***** -->
diff --git a/mozilla/embedding/qa/jstests/networking/nsIFileProtocolHandler.html b/mozilla/embedding/qa/jstests/networking/nsIFileProtocolHandler.html
index cb7a0a9a7d4..a520098201c 100644
--- a/mozilla/embedding/qa/jstests/networking/nsIFileProtocolHandler.html
+++ b/mozilla/embedding/qa/jstests/networking/nsIFileProtocolHandler.html
@@ -1,44 +1,41 @@
-
+
-
+
nsIFileProtocolHandler Tets case
diff --git a/mozilla/embedding/qa/jstests/networking/nsIIOService.html b/mozilla/embedding/qa/jstests/networking/nsIIOService.html
index 312f5dfea87..41fb718c3ca 100644
--- a/mozilla/embedding/qa/jstests/networking/nsIIOService.html
+++ b/mozilla/embedding/qa/jstests/networking/nsIIOService.html
@@ -1,44 +1,41 @@
-
+
-
+
nsIIOService Tets case
diff --git a/mozilla/embedding/qa/jstests/networking/nsIURI.html b/mozilla/embedding/qa/jstests/networking/nsIURI.html
index 3842b32a6da..0fc6037572e 100644
--- a/mozilla/embedding/qa/jstests/networking/nsIURI.html
+++ b/mozilla/embedding/qa/jstests/networking/nsIURI.html
@@ -1,44 +1,40 @@
-
+
-
+
nsIURI Tets case
diff --git a/mozilla/embedding/qa/jstests/nsIDocCharsetTest.txt b/mozilla/embedding/qa/jstests/nsIDocCharsetTest.txt
index 6b6ec8fb31d..fdbf31876e4 100644
--- a/mozilla/embedding/qa/jstests/nsIDocCharsetTest.txt
+++ b/mozilla/embedding/qa/jstests/nsIDocCharsetTest.txt
@@ -1,19 +1,15 @@
-
-
- nsIDocCharset Interface Test
-
+
+
+
+ nsIDocCharset Interface Test
+
diff --git a/mozilla/embedding/qa/jstests/nsIFontListTest.txt b/mozilla/embedding/qa/jstests/nsIFontListTest.txt
index d94b5c842d6..4df00a6b8f1 100644
--- a/mozilla/embedding/qa/jstests/nsIFontListTest.txt
+++ b/mozilla/embedding/qa/jstests/nsIFontListTest.txt
@@ -2,30 +2,45 @@
nsIFontList Interface Test
-
+ -
+ - 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 ***** -->
+
diff --git a/mozilla/embedding/qa/jstests/sHistory/nsISHListenerTestLib.js b/mozilla/embedding/qa/jstests/sHistory/nsISHListenerTestLib.js
index 9671e0855d2..f8013000df9 100644
--- a/mozilla/embedding/qa/jstests/sHistory/nsISHListenerTestLib.js
+++ b/mozilla/embedding/qa/jstests/sHistory/nsISHListenerTestLib.js
@@ -1,27 +1,40 @@
-/* Descrpt: test Sesion History interfaces
- Author: radha@netscape.com
- Revs: 06.27.01 - Created
-
- - 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 Communicator Test Cases.
- -
- - The Initial Developer of the Original Code is Netscape Communications
- - Corp. Portions created by Netscape Communications Corp. are
- - Copyright (C) 1999 Netscape Communications Corp. All
- - Rights Reserved.
- -
- - Contributor(s):
- depstein@netscape.com
-*/
+/* ***** 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 Communicator Test Cases..
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * radha@netscape.com (original author)
+ * depstein@netscape.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 ***** */
/********************************************************
nsISHistoryListener object
diff --git a/mozilla/embedding/qa/jstests/xpcom/nsIProperties.html b/mozilla/embedding/qa/jstests/xpcom/nsIProperties.html
index 78d8740f40f..a6b60f7597a 100644
--- a/mozilla/embedding/qa/jstests/xpcom/nsIProperties.html
+++ b/mozilla/embedding/qa/jstests/xpcom/nsIProperties.html
@@ -1,44 +1,40 @@
-
-
+
nsIProperties Tets case
diff --git a/mozilla/embedding/qa/testembed/BrowserView.cpp.mod b/mozilla/embedding/qa/testembed/BrowserView.cpp.mod
index 71b1f51b0c5..bb69c4d48b8 100644
--- a/mozilla/embedding/qa/testembed/BrowserView.cpp.mod
+++ b/mozilla/embedding/qa/testembed/BrowserView.cpp.mod
@@ -1,26 +1,40 @@
-/* -*- Mode: C++; 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 Netscape 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/NPL/
+ * 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.
+ * 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 Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation
+ * Portions created by the Initial Developer are Copyright (C) 1998
+ * the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Chak Nanga
- */
-
+ *
+ * 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 ***** */
+// -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
// File Overview....
//
// When the CBrowserFrm creates this View:
diff --git a/mozilla/embedding/qa/testembed/README.TXT b/mozilla/embedding/qa/testembed/README.TXT
index 553212b3367..aa6f853f5dc 100644
--- a/mozilla/embedding/qa/testembed/README.TXT
+++ b/mozilla/embedding/qa/testembed/README.TXT
@@ -1,26 +1,40 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- *
- * The contents of this file are subject to the Netscape 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/NPL/
- *
- * 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 Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s):
- * Chak Nanga
- * David Epstein
- */
+***** 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 is mozilla.org code.
+
+The Initial Developer of the Original Code is
+Netscape Communications Corporation.
+Portions created by the Initial Developer are Copyright (C) 1998
+the Initial Developer. All Rights Reserved.
+
+Contributor(s):
+ Chak Nanga
+ David Epstein
+
+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 *****
TestEmbed is a C++ test app based upon mfcEmbed. It includes
individual test cases for Embedding interface methods. Interfaces
diff --git a/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties b/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
index b1aa39713b5..e407b07ee23 100644
--- a/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
+++ b/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties
@@ -1,26 +1,41 @@
-# 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/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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 i18n strings, english
#
# The Initial Developer of the Original Code is
# Chiaki Koufugata.
-#
-# Copyright (C) Chiaki Koufugata.
-# All Rights Reserved.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Chiaki Koufugata, original author
# Robert Ginda, rginda@netscape.com, owner/maintainer
# James Ross, twpol@aol.com, pref pages code
#
+# 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 *****
unknown=
none=
diff --git a/mozilla/extensions/irc/xul/tests/test1.html b/mozilla/extensions/irc/xul/tests/test1.html
index fe4c80bced9..1288c0f2e14 100644
--- a/mozilla/extensions/irc/xul/tests/test1.html
+++ b/mozilla/extensions/irc/xul/tests/test1.html
@@ -1,28 +1,41 @@
-
+
JSIRC-test1
diff --git a/mozilla/extensions/python/xpcom/__init__.py b/mozilla/extensions/python/xpcom/__init__.py
index 57d64c99435..eac59f4aae3 100644
--- a/mozilla/extensions/python/xpcom/__init__.py
+++ b/mozilla/extensions/python/xpcom/__init__.py
@@ -1,18 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# Activestate Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond
+#
+# 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 *****
#
# The XPCOM (Cross Platform COM) package.
diff --git a/mozilla/extensions/python/xpcom/client/__init__.py b/mozilla/extensions/python/xpcom/client/__init__.py
index fe9252f9512..ea1847bc49d 100644
--- a/mozilla/extensions/python/xpcom/client/__init__.py
+++ b/mozilla/extensions/python/xpcom/client/__init__.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
import os
import new
diff --git a/mozilla/extensions/python/xpcom/components.py b/mozilla/extensions/python/xpcom/components.py
index e16d024040f..a34f6901656 100644
--- a/mozilla/extensions/python/xpcom/components.py
+++ b/mozilla/extensions/python/xpcom/components.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# This module provides the JavaScript "components" interface
import xpt
diff --git a/mozilla/extensions/python/xpcom/file.py b/mozilla/extensions/python/xpcom/file.py
index fa4113c0a8e..d128e56a21d 100644
--- a/mozilla/extensions/python/xpcom/file.py
+++ b/mozilla/extensions/python/xpcom/file.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
"""Implementation of Python file objects for Mozilla/xpcom.
diff --git a/mozilla/extensions/python/xpcom/nsError.py b/mozilla/extensions/python/xpcom/nsError.py
index a513967af2c..83f9587db8b 100644
--- a/mozilla/extensions/python/xpcom/nsError.py
+++ b/mozilla/extensions/python/xpcom/nsError.py
@@ -1,10 +1,15 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
@@ -12,8 +17,22 @@
# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
# ActiveState Tool Corp. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# Generated by h2py from nsError.h
# CMD line: h2py.py -i (nsresult) nsError.h
diff --git a/mozilla/extensions/python/xpcom/register.py b/mozilla/extensions/python/xpcom/register.py
index 97c6987624d..bc0ece9ec8d 100644
--- a/mozilla/extensions/python/xpcom/register.py
+++ b/mozilla/extensions/python/xpcom/register.py
@@ -1,10 +1,16 @@
+
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
@@ -12,8 +18,22 @@
# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
# ActiveState Tool Corp. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
import os, sys
diff --git a/mozilla/extensions/python/xpcom/server/__init__.py b/mozilla/extensions/python/xpcom/server/__init__.py
index 9f5f45d8e08..39905b4f1b6 100644
--- a/mozilla/extensions/python/xpcom/server/__init__.py
+++ b/mozilla/extensions/python/xpcom/server/__init__.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# Activestate Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond
#
+# 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 *****
# The xpcom.server package.
diff --git a/mozilla/extensions/python/xpcom/server/enumerator.py b/mozilla/extensions/python/xpcom/server/enumerator.py
index 68442e34374..d3fb89a9d75 100644
--- a/mozilla/extensions/python/xpcom/server/enumerator.py
+++ b/mozilla/extensions/python/xpcom/server/enumerator.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
from xpcom import components
diff --git a/mozilla/extensions/python/xpcom/server/loader.py b/mozilla/extensions/python/xpcom/server/loader.py
index bd8f16244bf..e2a4d6c762c 100644
--- a/mozilla/extensions/python/xpcom/server/loader.py
+++ b/mozilla/extensions/python/xpcom/server/loader.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# Activestate Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond
#
+# 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 *****
import xpcom
from xpcom import components
diff --git a/mozilla/extensions/python/xpcom/server/module.py b/mozilla/extensions/python/xpcom/server/module.py
index caa9cd5076e..094abc29b31 100644
--- a/mozilla/extensions/python/xpcom/server/module.py
+++ b/mozilla/extensions/python/xpcom/server/module.py
@@ -1,10 +1,15 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
@@ -12,8 +17,22 @@
# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
# ActiveState Tool Corp. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
from xpcom import components
from xpcom import ServerException, Exception
diff --git a/mozilla/extensions/python/xpcom/server/policy.py b/mozilla/extensions/python/xpcom/server/policy.py
index 12fb4ff24fd..90bc4e0346c 100644
--- a/mozilla/extensions/python/xpcom/server/policy.py
+++ b/mozilla/extensions/python/xpcom/server/policy.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
+# The Original Code is Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
from xpcom import xpcom_consts, _xpcom, client, nsError, ServerException, COMException
import xpcom
diff --git a/mozilla/extensions/python/xpcom/test/regrtest.py b/mozilla/extensions/python/xpcom/test/regrtest.py
index 5f6d1ebf390..33a3a226a1b 100644
--- a/mozilla/extensions/python/xpcom/test/regrtest.py
+++ b/mozilla/extensions/python/xpcom/test/regrtest.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
+# The Original Code is Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# regrtest.py
#
diff --git a/mozilla/extensions/python/xpcom/test/test_com_exceptions.py b/mozilla/extensions/python/xpcom/test/test_com_exceptions.py
index 650d92bbf3b..732e9821ef0 100644
--- a/mozilla/extensions/python/xpcom/test/test_com_exceptions.py
+++ b/mozilla/extensions/python/xpcom/test/test_com_exceptions.py
@@ -1,10 +1,15 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
@@ -12,8 +17,22 @@
# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
# ActiveState Tool Corp. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# Test pyxpcom exception.
diff --git a/mozilla/extensions/python/xpcom/test/test_comfile.py b/mozilla/extensions/python/xpcom/test/test_comfile.py
index 9e5fa0542be..39c9c51e76c 100644
--- a/mozilla/extensions/python/xpcom/test/test_comfile.py
+++ b/mozilla/extensions/python/xpcom/test/test_comfile.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (markh@activestate.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 *****
"""Test the xpcom.file module."""
# Called "test_comfile" as Python has a standard test called test_file :-(
diff --git a/mozilla/extensions/python/xpcom/test/test_components.py b/mozilla/extensions/python/xpcom/test/test_components.py
index 9366031a7aa..85c192df384 100644
--- a/mozilla/extensions/python/xpcom/test/test_components.py
+++ b/mozilla/extensions/python/xpcom/test/test_components.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
"""Tests the "xpcom.components" object.
"""
diff --git a/mozilla/extensions/python/xpcom/test/test_misc.py b/mozilla/extensions/python/xpcom/test/test_misc.py
index 8af65f9fd97..e351e017b71 100644
--- a/mozilla/extensions/python/xpcom/test/test_misc.py
+++ b/mozilla/extensions/python/xpcom/test/test_misc.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# Activestate Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond
#
+# 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 *****
import xpcom
import xpcom.client
diff --git a/mozilla/extensions/python/xpcom/test/test_streams.py b/mozilla/extensions/python/xpcom/test/test_streams.py
index 76e02ca1ef7..2545a58427f 100644
--- a/mozilla/extensions/python/xpcom/test/test_streams.py
+++ b/mozilla/extensions/python/xpcom/test/test_streams.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000,2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
import xpcom
from xpcom import _xpcom, components, COMException, ServerException, nsError
diff --git a/mozilla/extensions/python/xpcom/test/test_weakreferences.py b/mozilla/extensions/python/xpcom/test/test_weakreferences.py
index 74f9e62442e..88bd3a7927e 100644
--- a/mozilla/extensions/python/xpcom/test/test_weakreferences.py
+++ b/mozilla/extensions/python/xpcom/test/test_weakreferences.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# test_weakreferences.py - Test our weak reference implementation.
from xpcom import components, _xpcom
diff --git a/mozilla/extensions/python/xpcom/tools/regxpcom.py b/mozilla/extensions/python/xpcom/tools/regxpcom.py
index d8289385c96..c5c70a1a93f 100644
--- a/mozilla/extensions/python/xpcom/tools/regxpcom.py
+++ b/mozilla/extensions/python/xpcom/tools/regxpcom.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
+# The Original Code is Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# regxpcom.py - basically the standard regxpcom.cpp ported to Python.
diff --git a/mozilla/extensions/python/xpcom/tools/tracer_demo.py b/mozilla/extensions/python/xpcom/tools/tracer_demo.py
index 9a0552d00a9..cc37299580d 100644
--- a/mozilla/extensions/python/xpcom/tools/tracer_demo.py
+++ b/mozilla/extensions/python/xpcom/tools/tracer_demo.py
@@ -1,3 +1,39 @@
+# ***** 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 Python XPCOM language bindings.
+#
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Mark Hammond (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 *****
# 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/
diff --git a/mozilla/extensions/python/xpcom/xpcom_consts.py b/mozilla/extensions/python/xpcom/xpcom_consts.py
index 110a36b9408..933f93ef751 100644
--- a/mozilla/extensions/python/xpcom/xpcom_consts.py
+++ b/mozilla/extensions/python/xpcom/xpcom_consts.py
@@ -1,19 +1,39 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): Mark Hammond (original author)
+# Contributor(s):
+# Mark Hammond (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 *****
# Could maybe later have a process that extracted these enums should they change.
# from nsFileLocations.h
diff --git a/mozilla/extensions/python/xpcom/xpt.py b/mozilla/extensions/python/xpcom/xpt.py
index c03d152a707..fdbfdb9a507 100644
--- a/mozilla/extensions/python/xpcom/xpt.py
+++ b/mozilla/extensions/python/xpcom/xpt.py
@@ -1,20 +1,40 @@
+# ***** 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/
+# 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.
+# 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 the Python XPCOM language bindings.
#
-# The Initial Developer of the Original Code is ActiveState Tool Corp.
-# Portions created by ActiveState Tool Corp. are Copyright (C) 2000, 2001
-# ActiveState Tool Corp. All Rights Reserved.
+# The Initial Developer of the Original Code is
+# ActiveState Tool Corp.
+# Portions created by the Initial Developer are Copyright (C) 2000, 2001
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s): David Ascher (original author)
-# Mark Hammond
+# Contributor(s):
+# David Ascher (original author)
+# Mark Hammond
#
+# 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 *****
"""
Program: xpt.py
diff --git a/mozilla/extensions/transformiix/source/examples/identity.xsl b/mozilla/extensions/transformiix/source/examples/identity.xsl
index 2db0beb9ee5..7acbfdc5cff 100644
--- a/mozilla/extensions/transformiix/source/examples/identity.xsl
+++ b/mozilla/extensions/transformiix/source/examples/identity.xsl
@@ -1,25 +1,40 @@
+ -
+ - The Initial Developer of the Original Code is
+ - Netscape Communications Corporation.
+ - Portions created by the Initial Developer are Copyright (C) 2001
+ - the Initial Developer. All Rights Reserved.
+ -
+ - Contributor(s):
+ -
+ - 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 ***** -->
Web Service Proxy Tests
diff --git a/mozilla/extensions/xmlterm/doc/XMLterm_LICENSE b/mozilla/extensions/xmlterm/doc/XMLterm_LICENSE
index bcaf8bcb7a4..337515e6df2 100644
--- a/mozilla/extensions/xmlterm/doc/XMLterm_LICENSE
+++ b/mozilla/extensions/xmlterm/doc/XMLterm_LICENSE
@@ -1,19 +1,35 @@
-/*
- * The contents of this file are subject to the Mozilla Public
- * License Version 1.1 (the "MPL"); you may not use this file
- * except in compliance with the MPL. You may obtain a copy of
- * the MPL at http://www.mozilla.org/MPL/
- *
- * Software distributed under the MPL is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the MPL for the specific language governing
- * rights and limitations under the MPL.
+/* ***** 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 XMLterm.
*
- * The Initial Developer of the Original Code is Ramalingam Saravanan.
- * Portions created by Ramalingam Saravanan are
- * Copyright (C) 1999 Ramalingam Saravanan. All Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Ramalingam Saravanan .
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- */
+ *
+ * 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 ***** */
\ No newline at end of file
diff --git a/mozilla/gfx/gfx-config.h.in b/mozilla/gfx/gfx-config.h.in
index 5ce7a39d776..056cbc1a52f 100644
--- a/mozilla/gfx/gfx-config.h.in
+++ b/mozilla/gfx/gfx-config.h.in
@@ -1,25 +1,39 @@
-/* -*- Mode: C++; 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 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 Netscape
- * Communications Corporation. Portions created by Netscape are
- * Copyright (C) 2003 Netscape Communications Corporation.
- * All Rights Reserved.
- *
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2003
+ * the Initial Developer. All Rights Reserved.
+ *
* Contributor(s):
*
- */
+ * 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 ***** */
+
#ifndef _GFX_CONFIG_H_
#define _GFX_CONFIG_H_
diff --git a/mozilla/gfx/src/gtk/fontEncoding.properties b/mozilla/gfx/src/gtk/fontEncoding.properties
index 646a7ab6c64..5ece8afbaec 100644
--- a/mozilla/gfx/src/gtk/fontEncoding.properties
+++ b/mozilla/gfx/src/gtk/fontEncoding.properties
@@ -1,24 +1,40 @@
-##
-## 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
-## Contributor(s):
-## Roger B. Sidje
-## Jungshik Shin
-##
+# ***** 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 MathML Project.
+#
+# The Initial Developer of the Original Code is
+# The University of Queensland.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Roger B. Sidje
+# Jungshik Shin
+#
+# 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/gfx/src/mac/fontEncoding.properties b/mozilla/gfx/src/mac/fontEncoding.properties
index 74834612f4f..7bb0bfcdba9 100644
--- a/mozilla/gfx/src/mac/fontEncoding.properties
+++ b/mozilla/gfx/src/mac/fontEncoding.properties
@@ -1,23 +1,39 @@
-##
-## 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.
-##
+## ***** 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
+##
+## The Initial Developer of the Original Code is
+## The University Of Queensland.
+## Portions created by the Initial Developer are Copyright (C) 2001
+## the Initial Developer. All Rights Reserved.
+##
## Contributor(s):
## Roger B. Sidje
-##
+##
+## 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/gfx/src/windows/fontEncoding.properties b/mozilla/gfx/src/windows/fontEncoding.properties
index 138583cd513..ac8b8492442 100644
--- a/mozilla/gfx/src/windows/fontEncoding.properties
+++ b/mozilla/gfx/src/windows/fontEncoding.properties
@@ -1,23 +1,39 @@
-##
-## 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
-## Contributor(s):
-## Roger B. Sidje
-##
+# ***** 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 MathML Project.
+#
+# The Initial Developer of the Original Code is
+# The University Of Queensland.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Roger B. Sidje
+#
+# 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/intl/chardet/tools/gencyrillic.pl b/mozilla/intl/chardet/tools/gencyrillic.pl
index 311f5b95873..f61c5fa9faa 100644
--- a/mozilla/intl/chardet/tools/gencyrillic.pl
+++ b/mozilla/intl/chardet/tools/gencyrillic.pl
@@ -1,31 +1,83 @@
#!/usr/local/bin/perl
+# ***** 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 Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
use StatKoi '.' ;
open(FILE, "> ../src/nsCyrillicProb.h") or die "cannot open nsCyrillicDetector.h";
print FILE <
+# ***** 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 Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):
+# IBM Corporation
+# Jungshik Shin
+#
+# 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 *****
## Rule of this file:
## 1. key should always be in lower case ascii so we can do case insensitive
diff --git a/mozilla/intl/uconv/src/charsetTitles.properties b/mozilla/intl/uconv/src/charsetTitles.properties
index 2183ab62e11..3844f3c8ba2 100644
--- a/mozilla/intl/uconv/src/charsetTitles.properties
+++ b/mozilla/intl/uconv/src/charsetTitles.properties
@@ -1,22 +1,38 @@
-##
-## The contents of this file are subject to the Netscape 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/NPL/
-##
-## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
+# ***** 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 Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
## Rule of this file:
## 1. key should always be in lower case ascii so we can do case insensitive
diff --git a/mozilla/intl/uconv/src/charsetalias.properties b/mozilla/intl/uconv/src/charsetalias.properties
index 5acd50002f6..3208b6a1776 100644
--- a/mozilla/intl/uconv/src/charsetalias.properties
+++ b/mozilla/intl/uconv/src/charsetalias.properties
@@ -1,24 +1,40 @@
+## ***** BEGIN LICENSE BLOCK *****
+## Version: MPL 1.1/GPL 2.0/LGPL 2.1
##
-## The contents of this file are subject to the Netscape 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/NPL/
+## 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.
+## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
+## The Initial Developer of the Original Code is
+## Netscape Communications Corporation.
+## Portions created by the Initial Developer are Copyright (C) 1999
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
## IBM Corporation
##
+## 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 Original Code has been modified by IBM Corporation.
## Modifications made by IBM described herein are
## Copyright (c) International Business Machines
@@ -39,6 +55,7 @@
## 4. If the charset is not used for document charset, but font charset
## (e.g. XLFD charset- such as JIS x0201, JIS x0208), don't put here
##
+
us-ascii=us-ascii
ansi_x3.4-1968=us-ascii
646=us-ascii
diff --git a/mozilla/intl/uconv/src/maccharset.properties b/mozilla/intl/uconv/src/maccharset.properties
index 3848e2fb52a..e1d6384de97 100644
--- a/mozilla/intl/uconv/src/maccharset.properties
+++ b/mozilla/intl/uconv/src/maccharset.properties
@@ -1,23 +1,39 @@
-##
-## The contents of this file are subject to the Netscape 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/NPL/
-##
-## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
-##
+# ***** 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 is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
## Region code section, this is used to map a region code to a charset name
## It have higher priority than the Script code section
##
diff --git a/mozilla/intl/uconv/src/os2charset.properties b/mozilla/intl/uconv/src/os2charset.properties
index 0015a20aa5a..39e4e27e827 100644
--- a/mozilla/intl/uconv/src/os2charset.properties
+++ b/mozilla/intl/uconv/src/os2charset.properties
@@ -1,26 +1,43 @@
+## ***** BEGIN LICENSE BLOCK *****
+## Version: MPL 1.1/GPL 2.0/LGPL 2.1
##
-## The contents of this file are subject to the Netscape 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/NPL/
+## 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.
+## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
+## The Initial Developer of the Original Code is
+## Netscape Communications Corporation.
+## Portions created by the Initial Developer are Copyright (C) 1999
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
##
+## 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 file map an OS/2 codepage to a charset name
## We use this to figure out the charset of file system, clipboard, etc
##
+
os2.850=IBM850
os2.852=IBM852
os2.855=IBM855
diff --git a/mozilla/intl/uconv/src/unixcharset.properties b/mozilla/intl/uconv/src/unixcharset.properties
index c8585aa4084..d55a8b5810c 100644
--- a/mozilla/intl/uconv/src/unixcharset.properties
+++ b/mozilla/intl/uconv/src/unixcharset.properties
@@ -1,30 +1,46 @@
+# ***** 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
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# IBM Corporation
+#
+# 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 *****
+
##
## NOTE: THIS FILE IS DEPRECATED
## except for those *nix systems that do not support
## nl_langinfo(CODESET) this file should not be used
##
##
-## The contents of this file are subject to the Netscape 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/NPL/
-##
-## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
-## IBM Corporation
-##
-##
## Platform specific section.
## Map a given locale name in a particular platform (OS) to a charset name
## This have highgher priority than the all section
diff --git a/mozilla/intl/uconv/src/unixcharset.sample.properties b/mozilla/intl/uconv/src/unixcharset.sample.properties
index 2f9cce43ed6..1a4bf43a3c3 100644
--- a/mozilla/intl/uconv/src/unixcharset.sample.properties
+++ b/mozilla/intl/uconv/src/unixcharset.sample.properties
@@ -1,23 +1,39 @@
-##
-##
-## The contents of this file are subject to the Netscape 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/NPL/
-##
-## 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.
-##
+## ***** 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
+## Netscape Communications Corporation.
+## Portions created by the Initial Developer are Copyright (C) 1999
+## the Initial Developer. All Rights Reserved.
+##
+## Contributor(s):
+##
+## 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 *****
##
-## The Initial Developer of the Original Code is Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
##
## This file (unixcharset.sample.properties) is a sample file for
## mapping between nl_langinfo(CODESET) and the charset name aliases
diff --git a/mozilla/intl/uconv/src/wincharset.properties b/mozilla/intl/uconv/src/wincharset.properties
index edb6aeee027..79efb73f707 100644
--- a/mozilla/intl/uconv/src/wincharset.properties
+++ b/mozilla/intl/uconv/src/wincharset.properties
@@ -1,26 +1,43 @@
+## ***** BEGIN LICENSE BLOCK *****
+## Version: MPL 1.1/GPL 2.0/LGPL 2.1
##
-## The contents of this file are subject to the Netscape 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/NPL/
+## 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.
+## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
+## The Initial Developer of the Original Code is
+## Netscape Communications Corportation.
+## Portions created by the Initial Developer are Copyright (C) 1999
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
##
+## 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 file map a ACP to a charset name
## We use this to figure out the charset of file system, clipboard, etc
##
+
acp.874=TIS-620
acp.932=Shift_JIS
acp.936=gb18030
diff --git a/mozilla/intl/uconv/ucvcn/gb180304bytes.ut b/mozilla/intl/uconv/ucvcn/gb180304bytes.ut
index 2185f7b9873..a2ca48ad467 100644
--- a/mozilla/intl/uconv/ucvcn/gb180304bytes.ut
+++ b/mozilla/intl/uconv/ucvcn/gb180304bytes.ut
@@ -1,20 +1,42 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-*
-* The contents of this file are subject to the Netscape Public License
-* Version 1.0 (the "NPL"); you may not use this file except in
-* compliance with the NPL. You may obtain a copy of the NPL at
-* http://www.mozilla.org/NPL/
-*
-* Software distributed under the NPL is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-* for the specific language governing rights and limitations under the
-* NPL.
-*
-* The Initial Developer of this code under the NPL is Netscape
-* Communications Corporation. Portions created by Netscape are
-* Copyright (C) 2001 Netscape Communications Corporation. All Rights
-* Reserved.
-*/
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/* ***** 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 Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ * ftang@netscape
+ *
+ * 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 is a Generated file. Please don't edit it.
diff --git a/mozilla/intl/uconv/ucvko/u20cp949hangul.ut b/mozilla/intl/uconv/ucvko/u20cp949hangul.ut
index f0c8328f713..79b7ad8acbd 100644
--- a/mozilla/intl/uconv/ucvko/u20cp949hangul.ut
+++ b/mozilla/intl/uconv/ucvko/u20cp949hangul.ut
@@ -1,20 +1,42 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-*
-* The contents of this file are subject to the Netscape Public License
-* Version 1.0 (the "NPL"); you may not use this file except in
-* compliance with the NPL. You may obtain a copy of the NPL at
-* http://www.mozilla.org/NPL/
-*
-* Software distributed under the NPL is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-* for the specific language governing rights and limitations under the
-* NPL.
-*
-* The Initial Developer of this code under the NPL is Netscape
-* Communications Corporation. Portions created by Netscape are
-* Copyright (C) 2001 Netscape Communications Corporation. All Rights
-* Reserved.
-*/
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/* ***** 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 Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All Rights
+ * Reserved.
+ *
+ * Contributor(s):
+ * ftang@netscape
+ *
+ * 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 is a Generated file. Please don't edit it.
diff --git a/mozilla/intl/uconv/ucvlatin/macarabic.ut b/mozilla/intl/uconv/ucvlatin/macarabic.ut
index de5111314d8..c1439da9507 100644
--- a/mozilla/intl/uconv/ucvlatin/macarabic.ut
+++ b/mozilla/intl/uconv/ucvlatin/macarabic.ut
@@ -1,20 +1,42 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-*
-* The contents of this file are subject to the Netscape Public License
-* Version 1.0 (the "NPL"); you may not use this file except in
-* compliance with the NPL. You may obtain a copy of the NPL at
-* http://www.mozilla.org/NPL/
-*
-* Software distributed under the NPL is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-* for the specific language governing rights and limitations under the
-* NPL.
-*
-* The Initial Developer of this code under the NPL is Netscape
-* Communications Corporation. Portions created by Netscape are
-* Copyright (C) 2001 Netscape Communications Corporation. All Rights
-* Reserved.
-*/
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/* ***** 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 Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 2001 Netscape Communications Corporation. All Rights
+ * Reserved.
+ *
+ * Contributor(s):
+ * ftang@netscape
+ *
+ * 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 is a Generated file. Please don't edit it.
diff --git a/mozilla/intl/uconv/ucvlatin/tis620.ut b/mozilla/intl/uconv/ucvlatin/tis620.ut
index 1d0db336348..719cba74d92 100644
--- a/mozilla/intl/uconv/ucvlatin/tis620.ut
+++ b/mozilla/intl/uconv/ucvlatin/tis620.ut
@@ -1,20 +1,41 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-*
-* The contents of this file are subject to the Netscape Public License
-* Version 1.0 (the "NPL"); you may not use this file except in
-* compliance with the NPL. You may obtain a copy of the NPL at
-* http://www.mozilla.org/NPL/
-*
-* Software distributed under the NPL is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-* for the specific language governing rights and limitations under the
-* NPL.
-*
-* The Initial Developer of this code under the NPL is Netscape
-* Communications Corporation. Portions created by Netscape are
-* Copyright (C) 2001 Netscape Communications Corporation. All Rights
-* Reserved.
-*/
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/* ***** 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
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 is a Generated file. Please don't edit it.
diff --git a/mozilla/intl/unicharutil/tables/html40Latin1.properties b/mozilla/intl/unicharutil/tables/html40Latin1.properties
index 1d88f0c64af..7d8e1d3d8d7 100644
--- a/mozilla/intl/unicharutil/tables/html40Latin1.properties
+++ b/mozilla/intl/unicharutil/tables/html40Latin1.properties
@@ -1,27 +1,43 @@
-##
-## The contents of this file are subject to the Netscape 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/NPL/
-##
-## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
-##
+# ***** 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 Netscape
+# Communications Corporation. Portions created by Netscape are
+# Copyright (C) 1999 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
+
# LOCALIZATION NOTE FILE
-# This file contains names that assign html elements to
-# ascii codepoints. Do not translate any of the "entities" in
-# this file.
+# This file contains names that assign html elements to
+# ascii codepoints. Do not translate any of the "entities" in
+# this file.
entity.list.name=html40Latin1
entity.160=
diff --git a/mozilla/intl/unicharutil/tables/html40Special.properties b/mozilla/intl/unicharutil/tables/html40Special.properties
index f74cd47846d..6b06e93c70d 100644
--- a/mozilla/intl/unicharutil/tables/html40Special.properties
+++ b/mozilla/intl/unicharutil/tables/html40Special.properties
@@ -1,23 +1,38 @@
+## ***** BEGIN LICENSE BLOCK *****
+## Version: MPL 1.1/GPL 2.0/LGPL 2.1
##
-## The contents of this file are subject to the Netscape 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/NPL/
+## 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.
+## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
+## The Initial Developer of the Original Code is
+## Netscape Communications Corporation.
+## Portions created by the Initial Developer are Copyright (C) 1999
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
##
+## 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 *****
# LOCALIZATION NOTE: FILE
# This file contains names that assign entity references to
diff --git a/mozilla/intl/unicharutil/tables/html40Symbols.properties b/mozilla/intl/unicharutil/tables/html40Symbols.properties
index 01650ad486f..c81a2ed50fe 100644
--- a/mozilla/intl/unicharutil/tables/html40Symbols.properties
+++ b/mozilla/intl/unicharutil/tables/html40Symbols.properties
@@ -1,23 +1,38 @@
-##
-## The contents of this file are subject to the Netscape 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/NPL/
-##
-## 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 Netscape
-## Communications Corporation. Portions created by Netscape are
-## Copyright (C) 1999 Netscape Communications Corporation. All
-## Rights Reserved.
-##
-## Contributor(s):
-##
+# ***** 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
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
# LOCALIZATION NOTE FILE
# Do not translate this file.
diff --git a/mozilla/layout/mathml/base/src/mathfont.properties b/mozilla/layout/mathml/base/src/mathfont.properties
index 2f446fe05af..adbd9998503 100644
--- a/mozilla/layout/mathml/base/src/mathfont.properties
+++ b/mozilla/layout/mathml/base/src/mathfont.properties
@@ -1,23 +1,39 @@
-##
-## 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
-## Contributor(s):
-## Roger B. Sidje
-##
+# ***** 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 MathML Project.
+#
+# The Initial Developer of the Original Code is
+# The University Of Queensland.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Roger B. Sidje
+#
+# 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 *****
##LOCALIZATION NOTE:
# These are used to display an alert box to warn users when MathML fonts
diff --git a/mozilla/layout/mathml/base/src/mathfontCMEX10.properties b/mozilla/layout/mathml/base/src/mathfontCMEX10.properties
index 722820cb2f8..af01341b7bc 100644
--- a/mozilla/layout/mathml/base/src/mathfontCMEX10.properties
+++ b/mozilla/layout/mathml/base/src/mathfontCMEX10.properties
@@ -1,23 +1,39 @@
-##
-## 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
-## Contributor(s):
-## Roger B. Sidje
-##
+# ***** 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 MathML Project.
+#
+# The Initial Developer of the Original Code is
+# The University Of Queensland.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Roger B. Sidje
+#
+# 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/mathfontCMSY10.properties b/mozilla/layout/mathml/base/src/mathfontCMSY10.properties
index 9fba4c3698a..398b47c1051 100644
--- a/mozilla/layout/mathml/base/src/mathfontCMSY10.properties
+++ b/mozilla/layout/mathml/base/src/mathfontCMSY10.properties
@@ -1,23 +1,39 @@
+## ***** 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 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 MathML Project.
##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
+## The Initial Developer of the Original Code is
+## The University of Queensland.
+## Portions created by the Initial Developer are Copyright (C) 2001
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
## Roger B. Sidje
##
+## 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/mathfontMTExtra.properties b/mozilla/layout/mathml/base/src/mathfontMTExtra.properties
index eed987ad7c2..d28e93f517a 100644
--- a/mozilla/layout/mathml/base/src/mathfontMTExtra.properties
+++ b/mozilla/layout/mathml/base/src/mathfontMTExtra.properties
@@ -1,23 +1,38 @@
-##
-## 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
-## Contributor(s):
-## Roger B. Sidje
-##
+# ***** 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 MathML Project.
+#
+# The Initial Developer of the Original Code is The University Of
+# Queensland. Portions created by The University Of Queensland are
+# Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
+#
+# Contributor(s):
+# Roger B. Sidje
+#
+# 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/mathfontMath1.properties b/mozilla/layout/mathml/base/src/mathfontMath1.properties
index 3ce9b684e45..2bbd56b83b4 100644
--- a/mozilla/layout/mathml/base/src/mathfontMath1.properties
+++ b/mozilla/layout/mathml/base/src/mathfontMath1.properties
@@ -1,23 +1,39 @@
-##
-## 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
-## Contributor(s):
-## Roger B. Sidje
-##
+# ***** 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 MathML Project.
+#
+# The Initial Developer of the Original Code is
+# The University Of Queensland.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Roger B. Sidje
+#
+# 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/mathfontMath2.properties b/mozilla/layout/mathml/base/src/mathfontMath2.properties
index 97324ac3b86..7c7fc50b29e 100644
--- a/mozilla/layout/mathml/base/src/mathfontMath2.properties
+++ b/mozilla/layout/mathml/base/src/mathfontMath2.properties
@@ -1,23 +1,39 @@
+## ***** 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 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 MathML Project.
##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
+## The Initial Developer of the Original Code is
+## The University of Queensland.
+## Portions created by the Initial Developer are Copyright (C) 2001
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
## Roger B. Sidje
##
+## 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/mathfontMath4.properties b/mozilla/layout/mathml/base/src/mathfontMath4.properties
index bcb931154e3..4221fc1f8a3 100644
--- a/mozilla/layout/mathml/base/src/mathfontMath4.properties
+++ b/mozilla/layout/mathml/base/src/mathfontMath4.properties
@@ -1,23 +1,39 @@
+## ***** 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 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 MathML Project.
##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
+## The Initial Developer of the Original Code is
+## The University of Queensland.
+## Portions created by the Initial Developer are Copyright (C) 2001
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
## Roger B. Sidje
##
+## 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/mathfontPUA.properties b/mozilla/layout/mathml/base/src/mathfontPUA.properties
index ce0174d01d8..703710207c4 100644
--- a/mozilla/layout/mathml/base/src/mathfontPUA.properties
+++ b/mozilla/layout/mathml/base/src/mathfontPUA.properties
@@ -1,23 +1,39 @@
-##
-## 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 MathML Project.
-##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
-##
-## Contributor(s):
-## Roger B. Sidje
-##
+# ***** 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 MathML Project.
+#
+# The Initial Developer of the Original Code is
+# The University Of Queensland.
+# Portions created by the Initial Developer are Copyright (C) 2001
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+# Roger B. Sidje
+#
+# 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/mathfontSymbol.properties b/mozilla/layout/mathml/base/src/mathfontSymbol.properties
index f54aaeb9a6c..a8f3ef176b1 100644
--- a/mozilla/layout/mathml/base/src/mathfontSymbol.properties
+++ b/mozilla/layout/mathml/base/src/mathfontSymbol.properties
@@ -1,23 +1,39 @@
+## ***** 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 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 MathML Project.
##
-## The Initial Developer of the Original Code is The University Of
-## Queensland. Portions created by The University Of Queensland are
-## Copyright (C) 2001 The University Of Queensland. All Rights Reserved.
+## The Initial Developer of the Original Code is
+## The University of Queensland.
+## Portions created by the Initial Developer are Copyright (C) 2001
+## the Initial Developer. All Rights Reserved.
##
## Contributor(s):
## Roger B. Sidje
##
+## 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 *****
# LOCALIZATION NOTE: FILE
# Do not translate anything in this file
diff --git a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp
index a4d4c1d71af..eea3d3c57fc 100644
--- a/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp
+++ b/mozilla/layout/mathml/base/src/nsMathMLTokenFrame.cpp
@@ -1,24 +1,40 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * 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/
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * 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 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 MathML Project.
*
- * The Initial Developer of the The Original Code is The University Of
- * Queensland. Portions created by The University Of Queensland are
- * Copyright (C) 1999 The University Of Queensland. All Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * The University of Queensland.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Roger B. Sidje
- */
+ *
+ * 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 ***** */
#include "nsCOMPtr.h"
#include "nsFrame.h"
diff --git a/mozilla/layout/mathml/tests/all-presentation.xml b/mozilla/layout/mathml/tests/all-presentation.xml
index 0a250cc061f..6aebd79f6c5 100644
--- a/mozilla/layout/mathml/tests/all-presentation.xml
+++ b/mozilla/layout/mathml/tests/all-presentation.xml
@@ -6,27 +6,42 @@
]>
-
+
Examples of Presentation Markup
diff --git a/mozilla/layout/mathml/tests/maxwell.xml b/mozilla/layout/mathml/tests/maxwell.xml
index f71af1bf891..52e931034fe 100644
--- a/mozilla/layout/mathml/tests/maxwell.xml
+++ b/mozilla/layout/mathml/tests/maxwell.xml
@@ -1,4 +1,41 @@
+
+
@@ -6,27 +43,6 @@
]>
-
Maxwell's Equations
diff --git a/mozilla/layout/mathml/tests/mixing.xml b/mozilla/layout/mathml/tests/mixing.xml
index 52df7b2daad..4d7d5e9c059 100644
--- a/mozilla/layout/mathml/tests/mixing.xml
+++ b/mozilla/layout/mathml/tests/mixing.xml
@@ -10,27 +10,42 @@
xmlns:math="http://www.w3.org/1998/Math/MathML"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
>
-
+
Mixing MathML with other markup
diff --git a/mozilla/layout/mathml/tests/simple.xml b/mozilla/layout/mathml/tests/simple.xml
index f281d00a794..c49a1ef695a 100644
--- a/mozilla/layout/mathml/tests/simple.xml
+++ b/mozilla/layout/mathml/tests/simple.xml
@@ -5,29 +5,45 @@
[
]>
-
-
+
+
+
Simple Document with MathML
diff --git a/mozilla/layout/mathml/tests/stretchy.xml b/mozilla/layout/mathml/tests/stretchy.xml
index 4429c8e5d89..b6333ce21c9 100644
--- a/mozilla/layout/mathml/tests/stretchy.xml
+++ b/mozilla/layout/mathml/tests/stretchy.xml
@@ -1,4 +1,40 @@
+
]>
-
Testing stretchy MathML symbols
diff --git a/mozilla/layout/mathml/tests/various.xml b/mozilla/layout/mathml/tests/various.xml
index 8c04b802fe7..f1d527293b9 100644
--- a/mozilla/layout/mathml/tests/various.xml
+++ b/mozilla/layout/mathml/tests/various.xml
@@ -1,4 +1,40 @@
+
]>
-
Various examples of MathML
diff --git a/mozilla/layout/xul/base/src/grid/nsGrid.h b/mozilla/layout/xul/base/src/grid/nsGrid.h
index 47f21325ef4..4811531aeb6 100644
--- a/mozilla/layout/xul/base/src/grid/nsGrid.h
+++ b/mozilla/layout/xul/base/src/grid/nsGrid.h
@@ -1,11 +1,12 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * The contents of this file are subject to the Netscape 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/NPL/
+ * 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
@@ -20,27 +21,22 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
+ * Eric D Vaughan (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
+ * 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
-/**
-
- Author:
- Eric D Vaughan
-
-**/
-
#ifndef nsGrid_h___
#define nsGrid_h___
diff --git a/mozilla/layout/xul/base/src/grid/nsGridLayout2.h b/mozilla/layout/xul/base/src/grid/nsGridLayout2.h
index 84d50399c40..994ba5cddaa 100644
--- a/mozilla/layout/xul/base/src/grid/nsGridLayout2.h
+++ b/mozilla/layout/xul/base/src/grid/nsGridLayout2.h
@@ -1,4 +1,5 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
@@ -20,6 +21,8 @@
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
+ * Eric D Vaughan (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"),
@@ -34,13 +37,6 @@
*
* ***** END LICENSE BLOCK ***** */
-/**
-
- Author:
- Eric D Vaughan
-
-**/
-
#ifndef nsGridLayout2_h___
#define nsGridLayout2_h___
diff --git a/mozilla/lib/mac/PowerPlant/pch/PPHeaders.pch++ b/mozilla/lib/mac/PowerPlant/pch/PPHeaders.pch++
index a6830d060ee..9b3182b9fbb 100644
--- a/mozilla/lib/mac/PowerPlant/pch/PPHeaders.pch++
+++ b/mozilla/lib/mac/PowerPlant/pch/PPHeaders.pch++
@@ -1,24 +1,41 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
+/* ***** 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 the Mozilla browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
*
- * 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 the Mozilla browser.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc. Portions created by Netscape are
- * Copyright (C) 1999, Mozilla. All Rights Reserved.
- *
* Contributor(s):
* Conrad Carlen
- */
+ *
+ * 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 ***** */
//--------------------------------------------------------------------------------
//
diff --git a/mozilla/lib/mac/PowerPlant/pch/PPHeadersDebug.pch++ b/mozilla/lib/mac/PowerPlant/pch/PPHeadersDebug.pch++
index 8e39b6b9328..7d2c29b5c3e 100644
--- a/mozilla/lib/mac/PowerPlant/pch/PPHeadersDebug.pch++
+++ b/mozilla/lib/mac/PowerPlant/pch/PPHeadersDebug.pch++
@@ -1,24 +1,40 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * 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 the Mozilla browser.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications, Inc. Portions created by Netscape are
- * Copyright (C) 1999, Mozilla. All Rights Reserved.
- *
- * Contributor(s):
- * Conrad Carlen
- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+
//--------------------------------------------------------------------------------
//
diff --git a/mozilla/mailnews/base/resources/content/newFolderDialog.xul b/mozilla/mailnews/base/resources/content/newFolderDialog.xul
index df14818144a..d26412b906d 100644
--- a/mozilla/mailnews/base/resources/content/newFolderDialog.xul
+++ b/mozilla/mailnews/base/resources/content/newFolderDialog.xul
@@ -1,25 +1,42 @@
-
-->
diff --git a/mozilla/mailnews/base/resources/content/renameFolderDialog.xul b/mozilla/mailnews/base/resources/content/renameFolderDialog.xul
index 8f5cc855148..523ae7a78c3 100644
--- a/mozilla/mailnews/base/resources/content/renameFolderDialog.xul
+++ b/mozilla/mailnews/base/resources/content/renameFolderDialog.xul
@@ -1,26 +1,41 @@
-
+
diff --git a/mozilla/mailnews/base/resources/locale/en-US/newFolderDialog.dtd b/mozilla/mailnews/base/resources/locale/en-US/newFolderDialog.dtd
index 5e63bc9a17e..c63d5891bff 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/newFolderDialog.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/newFolderDialog.dtd
@@ -1,25 +1,39 @@
-
+
diff --git a/mozilla/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd b/mozilla/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd
index 382e2f13e49..72fce2e87d8 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/renameFolderDialog.dtd
@@ -1,26 +1,3 @@
-
-
diff --git a/mozilla/modules/oji/tests/script/autorun.pl b/mozilla/modules/oji/tests/script/autorun.pl
index 7dc8964e596..22bdaccc8c0 100755
--- a/mozilla/modules/oji/tests/script/autorun.pl
+++ b/mozilla/modules/oji/tests/script/autorun.pl
@@ -1,25 +1,41 @@
+#!/usr/bin/perl
#
-# 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/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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 Sun Microsystem
-# Inc. Portions created by Sun are
-# Copyright (C) 1999 Sun Microsystems, Inc. All
-# Rights Reserved.
+# The Initial Developer of the Original Code is
+# Sun Microsystems, Inc.
+# Portions created by the Initial Developer are Copyright (C) 1999
+# the Initial Developer. All Rights Reserved.
#
-# Contributor(s):
-# !/bin/perl
+# Contributor(s):
#
+# 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 *****
+
# Created By: Raju Pallath
# Creation Date: Aug 2nd 1999
#
diff --git a/mozilla/modules/oji/tests/src/Killer/killer.cpp.win98 b/mozilla/modules/oji/tests/src/Killer/killer.cpp.win98
index ea453aaf3b7..a887b8a4f20 100755
--- a/mozilla/modules/oji/tests/src/Killer/killer.cpp.win98
+++ b/mozilla/modules/oji/tests/src/Killer/killer.cpp.win98
@@ -1,24 +1,39 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * 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/
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * 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 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 Sun Microsystems,
- * Inc. Portions created by Sun are
- * Copyright (C) 1999 Sun Microsystems, Inc. All
- * Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Sun Microsystems, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
*
- * Contributor(s):
- */
-
+ * Contributor(s):
+ *
+ * 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 program is designed for Win32 platforms only */
diff --git a/mozilla/parser/htmlparser/tests/outsinks/mailquote.html b/mozilla/parser/htmlparser/tests/outsinks/mailquote.html
index 8ffa5bfe3a0..44f546e2e1f 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/mailquote.html
+++ b/mozilla/parser/htmlparser/tests/outsinks/mailquote.html
@@ -1,25 +1,40 @@
+
-
+
Mail Quoting Test
diff --git a/mozilla/parser/htmlparser/tests/outsinks/plain.html b/mozilla/parser/htmlparser/tests/outsinks/plain.html
index cd562b10c83..2c8264188ab 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/plain.html
+++ b/mozilla/parser/htmlparser/tests/outsinks/plain.html
@@ -1,24 +1,40 @@
-
+
+
+
Ender Plain Text Test Page
diff --git a/mozilla/parser/htmlparser/tests/outsinks/plainwrap.html b/mozilla/parser/htmlparser/tests/outsinks/plainwrap.html
index 2bd6b19920a..79137b0a3f6 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/plainwrap.html
+++ b/mozilla/parser/htmlparser/tests/outsinks/plainwrap.html
@@ -1,25 +1,42 @@
+
+
-
+
Ender Plain Text Test Page
diff --git a/mozilla/parser/htmlparser/tests/outsinks/simple.html b/mozilla/parser/htmlparser/tests/outsinks/simple.html
index 4576bfeca7b..ceea793366e 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/simple.html
+++ b/mozilla/parser/htmlparser/tests/outsinks/simple.html
@@ -1,26 +1,42 @@
-
+
Simple html page
Simple html page
diff --git a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.out b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.out
index 0b52b27b334..f81764a8c35 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.out
+++ b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.out
@@ -1,26 +1,41 @@
-
+
XIF Test Page
diff --git a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif
index b3169e13a3f..f3472d1f08c 100644
--- a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif
+++ b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif
@@ -13,25 +13,41 @@
- -- The contents of this file are subject to the Netscape 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/NPL/
- --
- -- 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 Communicator client code, released
- -- March 31, 1998.
+ -- ***** BEGIN LICENSE BLOCK *****
+ -- Version: MPL 1.1/GPL 2.0/LGPL 2.1
--
- -- The Initial Developer of the Original Code is Netscape
- -- Communications Corporation. Portions created by Netscape are
- -- Copyright (C) 1998-1999 Netscape Communications Corporation. All
- -- Rights Reserved.
+ -- 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 Communicator client code.
+ --
+ -- The Initial Developer of the Original Code is
+ -- Netscape Communications Corporation.
+ -- Portions created by the Initial Developer are Copyright (C) 1998
+ -- the Initial Developer. All Rights Reserved.
--
-- Contributor(s):
+ --
+ -- 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 *****
diff --git a/mozilla/tools/leaky/LibPreload.cpp b/mozilla/tools/leaky/LibPreload.cpp
index 5badc634d1b..a976e331a0a 100644
--- a/mozilla/tools/leaky/LibPreload.cpp
+++ b/mozilla/tools/leaky/LibPreload.cpp
@@ -1,14 +1,39 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Kipp E.B. Hickman (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 ***** */
#include "TestPreload.h"
#include "config.h"
diff --git a/mozilla/tools/leaky/Makefile.linux b/mozilla/tools/leaky/Makefile.linux
index 66945fbcf64..63505d6a252 100644
--- a/mozilla/tools/leaky/Makefile.linux
+++ b/mozilla/tools/leaky/Makefile.linux
@@ -1,16 +1,40 @@
#! gmake
#
-# 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/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# 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 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/
#
-# The Initial Developer of the Original Code is Kipp E.B. Hickman.
+# 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
+# Kipp E.B. Hickman.
+# Portions created by the Initial Developer are Copyright (C) 1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# 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 *****
CXX = c++
OPTIMIZER = -g
diff --git a/mozilla/tools/leaky/ShowLibs.cpp b/mozilla/tools/leaky/ShowLibs.cpp
index d2d53942549..88fe49a60ca 100644
--- a/mozilla/tools/leaky/ShowLibs.cpp
+++ b/mozilla/tools/leaky/ShowLibs.cpp
@@ -1,14 +1,37 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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 Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include
#include
diff --git a/mozilla/tools/leaky/TestLeaky.cpp b/mozilla/tools/leaky/TestLeaky.cpp
index b0613964614..37200043c48 100644
--- a/mozilla/tools/leaky/TestLeaky.cpp
+++ b/mozilla/tools/leaky/TestLeaky.cpp
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include
#include
diff --git a/mozilla/tools/leaky/TestPreload.cpp b/mozilla/tools/leaky/TestPreload.cpp
index eae6432df0d..9ce7a0f94d0 100644
--- a/mozilla/tools/leaky/TestPreload.cpp
+++ b/mozilla/tools/leaky/TestPreload.cpp
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include "TestPreload.h"
#include
diff --git a/mozilla/tools/leaky/TestPreload.h b/mozilla/tools/leaky/TestPreload.h
index 9eb42d340aa..05ba7ac7697 100644
--- a/mozilla/tools/leaky/TestPreload.h
+++ b/mozilla/tools/leaky/TestPreload.h
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#define LD_PRELOAD_TEST_MALLOC_SIZE 0x12345
diff --git a/mozilla/tools/leaky/bfd.cpp b/mozilla/tools/leaky/bfd.cpp
index bde3aa78f23..38fd7ad2082 100644
--- a/mozilla/tools/leaky/bfd.cpp
+++ b/mozilla/tools/leaky/bfd.cpp
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include "leaky.h"
diff --git a/mozilla/tools/leaky/coff.cpp b/mozilla/tools/leaky/coff.cpp
index d3f9037744f..a20ab3e83e5 100644
--- a/mozilla/tools/leaky/coff.cpp
+++ b/mozilla/tools/leaky/coff.cpp
@@ -1,14 +1,37 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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 Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include "leaky.h"
diff --git a/mozilla/tools/leaky/config.h b/mozilla/tools/leaky/config.h
index d79021dcd62..c5245f39920 100644
--- a/mozilla/tools/leaky/config.h
+++ b/mozilla/tools/leaky/config.h
@@ -1,14 +1,39 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
#ifndef config_h___
#define config_h___
diff --git a/mozilla/tools/leaky/dict.cpp b/mozilla/tools/leaky/dict.cpp
index 02f10beb1f7..d3474bc7e0c 100644
--- a/mozilla/tools/leaky/dict.cpp
+++ b/mozilla/tools/leaky/dict.cpp
@@ -1,14 +1,39 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Kipp E.B. Hickman (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 ***** */
#include
#include "dict.h"
diff --git a/mozilla/tools/leaky/dict.h b/mozilla/tools/leaky/dict.h
index 0cbae9b403c..e1f32cf22eb 100644
--- a/mozilla/tools/leaky/dict.h
+++ b/mozilla/tools/leaky/dict.h
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#ifndef __dict_h_
#define __dict_h_
diff --git a/mozilla/tools/leaky/elf.cpp b/mozilla/tools/leaky/elf.cpp
index 76e093bad28..98fc0bf0e2f 100644
--- a/mozilla/tools/leaky/elf.cpp
+++ b/mozilla/tools/leaky/elf.cpp
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include "leaky.h"
diff --git a/mozilla/tools/leaky/leaky.cpp b/mozilla/tools/leaky/leaky.cpp
index 0cf20322c88..6eabbdc25ed 100644
--- a/mozilla/tools/leaky/leaky.cpp
+++ b/mozilla/tools/leaky/leaky.cpp
@@ -1,14 +1,37 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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 Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include "leaky.h"
#include "dict.h"
diff --git a/mozilla/tools/leaky/libmalloc.h b/mozilla/tools/leaky/libmalloc.h
index 2610032fb01..2a7401e78fa 100644
--- a/mozilla/tools/leaky/libmalloc.h
+++ b/mozilla/tools/leaky/libmalloc.h
@@ -1,14 +1,39 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Kipp E.B. Hickman (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 ***** */
#ifndef libmalloc_h___
#define libmalloc_h___
diff --git a/mozilla/tools/leaky/strset.cpp b/mozilla/tools/leaky/strset.cpp
index f0bb7464950..29f222cac1a 100644
--- a/mozilla/tools/leaky/strset.cpp
+++ b/mozilla/tools/leaky/strset.cpp
@@ -1,14 +1,38 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Kipp E.B. Hickman.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
#include "strset.h"
#include
diff --git a/mozilla/tools/leaky/strset.h b/mozilla/tools/leaky/strset.h
index 8fefdf21b62..5db833547e6 100644
--- a/mozilla/tools/leaky/strset.h
+++ b/mozilla/tools/leaky/strset.h
@@ -1,14 +1,39 @@
-// 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 Initial Developer of the Original Code is Kipp E.B. Hickman.
+/* ***** 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
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 1999
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Kipp E.B. Hickman (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 ***** */
#ifndef __strset_h_
#define __strset_h_
diff --git a/mozilla/widget/src/cocoa/nsAppShellCocoa.mm b/mozilla/widget/src/cocoa/nsAppShellCocoa.mm
index 8d2770367e3..e6f0f6b50c6 100644
--- a/mozilla/widget/src/cocoa/nsAppShellCocoa.mm
+++ b/mozilla/widget/src/cocoa/nsAppShellCocoa.mm
@@ -1,11 +1,11 @@
/* -*- Mode: c++; tab-width: 2; indent-tabs-mode: nil; -*- */
/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * The contents of this file are subject to the Netscape Public License
+ * 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/NPL/
+ * 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
@@ -27,11 +27,11 @@
* 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/mozilla/widget/src/cocoa/nsChildView.mm b/mozilla/widget/src/cocoa/nsChildView.mm
index e9928d7a525..a5101c47b16 100644
--- a/mozilla/widget/src/cocoa/nsChildView.mm
+++ b/mozilla/widget/src/cocoa/nsChildView.mm
@@ -1,11 +1,11 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * The contents of this file are subject to the Netscape Public License
+ * 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/NPL/
+ * 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
@@ -27,11 +27,11 @@
* 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/mozilla/widget/src/cocoa/nsCocoaWindow.mm b/mozilla/widget/src/cocoa/nsCocoaWindow.mm
index 3399fb53cc9..7e01adf731f 100644
--- a/mozilla/widget/src/cocoa/nsCocoaWindow.mm
+++ b/mozilla/widget/src/cocoa/nsCocoaWindow.mm
@@ -1,11 +1,11 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * The contents of this file are subject to the Netscape 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/NPL/
+ * 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
@@ -22,16 +22,16 @@
* Contributor(s):
*
* 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
+ * 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/mozilla/widget/src/cocoa/nsFilePicker.mm b/mozilla/widget/src/cocoa/nsFilePicker.mm
index ff05101222c..20cd6d64b3f 100644
--- a/mozilla/widget/src/cocoa/nsFilePicker.mm
+++ b/mozilla/widget/src/cocoa/nsFilePicker.mm
@@ -1,28 +1,43 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** 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 browser.
*
- * 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 the Mozilla browser.
- *
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1999 Netscape Communications Corporation. All
* Rights Reserved.
- *
- * Contributor(s):
+ *
+ * Contributor(s):
* Stuart Parmenter
* Steve Dagley
* David Haas
* Simon Fraser
- */
+ *
+ * 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 ***** */
// Arrgh. Bitten by bug 154232 here.
// Need to undef DARWIN before including Cocoa & (by default) CoreFoundation
diff --git a/mozilla/widget/src/cocoa/nsToolkit.mm b/mozilla/widget/src/cocoa/nsToolkit.mm
index decf2220b77..3c58df788d5 100644
--- a/mozilla/widget/src/cocoa/nsToolkit.mm
+++ b/mozilla/widget/src/cocoa/nsToolkit.mm
@@ -1,11 +1,11 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * The contents of this file are subject to the Netscape Public License
+ * 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/NPL/
+ * 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
@@ -27,11 +27,11 @@
* 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 NPL, indicate your
+ * 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 NPL, the GPL or the LGPL.
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/mozilla/widget/src/xlibxtbin/xlibxtbin.cpp b/mozilla/widget/src/xlibxtbin/xlibxtbin.cpp
index 0966a6ef54d..8e18245c4b7 100644
--- a/mozilla/widget/src/xlibxtbin/xlibxtbin.cpp
+++ b/mozilla/widget/src/xlibxtbin/xlibxtbin.cpp
@@ -1,24 +1,41 @@
/* widget -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- * vim:ts=2:et:sw=2
- * XlibXtBin Implementation
- * Peter Hartshorn
- * Based on GtkXtBin by Rusty Lynch - 02/27/2000
+ * vim:ts=2:et:sw=2 */
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * 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/
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
+ * 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.
*
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Peter Hartshorn.
+ * Portions created by the Initial Developer are Copyright (C) 2000
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Based on GtkXtBin by Rusty Lynch - 02/27/2000
+ *
+ * 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 ***** */
#include "xlibxtbin.h"
#include "xlibrgb.h"
diff --git a/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in b/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
index f421956479a..b473b8f7f83 100644
--- a/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
+++ b/mozilla/xpfe/bootstrap/nsStaticComponents.cpp.in
@@ -1,26 +1,41 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+/* -*- Mode: C++; 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/
+ * 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.
+ * 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 Netscape Communications
- * Corporation. Portions created by Netscape are
- * Copyright (C) 2001 Netscape Communications Corporation. All
- * Rights Reserved.
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
*
* Contributor(s):
- * Christopher Seawood
- * Chris Waterson
- */
+ * Christopher Seawood
+ * Chris Waterson
+ *
+ * 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 ***** */
#line 26 "nsStaticComponents.cpp.in"
#define XPCOM_TRANSLATE_NSGM_ENTRY_POINT 1
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 2c2df22e3b7..e720160e086 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -22,7 +22,6 @@
Contributor(s):
Diego Biurrun
- - added disk cache folder choice
Alternatively, the contents of this file may be used under the terms of
either of the GNU General Public License Version 2 or later (the "GPL"),
diff --git a/mozilla/xpfe/global/resources/content/mozilla.xhtml b/mozilla/xpfe/global/resources/content/mozilla.xhtml
index 4b8b727dacb..d695c2900ed 100644
--- a/mozilla/xpfe/global/resources/content/mozilla.xhtml
+++ b/mozilla/xpfe/global/resources/content/mozilla.xhtml
@@ -1,29 +1,47 @@
+
+
+
-
-
The Book of Mozilla, 7:15
diff --git a/mozilla/xpinstall/wizard/windows/builder/readme.txt b/mozilla/xpinstall/wizard/windows/builder/readme.txt
index 0cc24410c68..5a03de0f156 100644
--- a/mozilla/xpinstall/wizard/windows/builder/readme.txt
+++ b/mozilla/xpinstall/wizard/windows/builder/readme.txt
@@ -1,25 +1,39 @@
+***** BEGIN LICENSE BLOCK *****
+Version: MPL 1.1/GPL 2.0/LGPL 2.1
-The contents of this file are subject to the Netscape 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/NPL/
+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.
+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 Communicator client code,
-released March 31, 1998.
+The Original Code is Mozilla Communicator client code.
-The Initial Developer of the Original Code is Netscape Communications
-Corporation. Portions created by Netscape are
-Copyright (C) 1999 Netscape Communications Corporation. All
-Rights Reserved.
+The Initial Developer of the Original Code is
+Netscape Communications Corporation.
+Portions created by the Initial Developer are Copyright (C) 1999
+the Initial Developer. All Rights Reserved.
-Contributor(s):
- Sean Su
+Contributor(s):
+ Sean Su
+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 *****
Purpose:
To build the mozilla self-extracting installer and its corresponding .xpi files