diff --git a/mozilla/chrome/Makefile.in b/mozilla/chrome/Makefile.in index a03d6f43bb5..0f8e4ec7962 100644 --- a/mozilla/chrome/Makefile.in +++ b/mozilla/chrome/Makefile.in @@ -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/ +# ***** 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 ***** DEPTH = .. topsrcdir = @top_srcdir@ diff --git a/mozilla/chrome/src/Makefile.in b/mozilla/chrome/src/Makefile.in index 3750096ffc1..d1052c9d649 100644 --- a/mozilla/chrome/src/Makefile.in +++ b/mozilla/chrome/src/Makefile.in @@ -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/ +# ***** 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 ***** DEPTH = ../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/chrome/src/nsChromeFactory.cpp b/mozilla/chrome/src/nsChromeFactory.cpp index 3f0f089406e..4ab3b74123b 100644 --- a/mozilla/chrome/src/nsChromeFactory.cpp +++ b/mozilla/chrome/src/nsChromeFactory.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/chrome/src/nsChromeProtocolHandler.cpp b/mozilla/chrome/src/nsChromeProtocolHandler.cpp index 0ed910d7086..e654c84471f 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.cpp +++ b/mozilla/chrome/src/nsChromeProtocolHandler.cpp @@ -1,12 +1,12 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* vim:set ts=4 sw=4 sts=4 et cin: */ /* ***** 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 @@ -15,7 +15,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -23,16 +23,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/chrome/src/nsChromeProtocolHandler.h b/mozilla/chrome/src/nsChromeProtocolHandler.h index 6ae1a4d79cc..d7a8269dda2 100644 --- a/mozilla/chrome/src/nsChromeProtocolHandler.h +++ b/mozilla/chrome/src/nsChromeProtocolHandler.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/chrome/src/nsChromeRegistry.cpp b/mozilla/chrome/src/nsChromeRegistry.cpp index 7d12c61c9f3..8132f704f8f 100644 --- a/mozilla/chrome/src/nsChromeRegistry.cpp +++ b/mozilla/chrome/src/nsChromeRegistry.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; 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,27 +14,27 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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): - * Original Author: David W. Hyatt (hyatt@netscape.com) - * Gagan Saksena - * Benjamin Smedberg + * Original Author: David W. Hyatt (hyatt@netscape.com) + * Gagan Saksena + * Benjamin Smedberg * * 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/chrome/src/nsChromeRegistry.h b/mozilla/chrome/src/nsChromeRegistry.h index 222477cdab1..e5445583d4f 100644 --- a/mozilla/chrome/src/nsChromeRegistry.h +++ b/mozilla/chrome/src/nsChromeRegistry.h @@ -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 + * 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): - * Original Author: David W. Hyatt (hyatt@netscape.com) + * Original Author: David W. Hyatt (hyatt@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 + * 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/chrome/src/nsChromeUIDataSource.cpp b/mozilla/chrome/src/nsChromeUIDataSource.cpp index 1edf533a990..19813525018 100644 --- a/mozilla/chrome/src/nsChromeUIDataSource.cpp +++ b/mozilla/chrome/src/nsChromeUIDataSource.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; 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 + * 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): - * Original Author: David W. Hyatt (hyatt@netscape.com) + * Original Author: David W. Hyatt (hyatt@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 + * 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/chrome/src/nsChromeUIDataSource.h b/mozilla/chrome/src/nsChromeUIDataSource.h index 1248f5ed684..297a056facb 100644 --- a/mozilla/chrome/src/nsChromeUIDataSource.h +++ b/mozilla/chrome/src/nsChromeUIDataSource.h @@ -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 + * 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): - * Original Author: David W. Hyatt (hyatt@netscape.com) + * Original Author: David W. Hyatt (hyatt@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 + * 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/chrome/tools/Makefile.in b/mozilla/chrome/tools/Makefile.in index 9aab9716b2b..d2182e0fa21 100644 --- a/mozilla/chrome/tools/Makefile.in +++ b/mozilla/chrome/tools/Makefile.in @@ -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/ +# ***** 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 ***** DEPTH = ../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/chrome/tools/chromereg/Makefile.in b/mozilla/chrome/tools/chromereg/Makefile.in index ceb5d3b4d2b..66bbb101c18 100644 --- a/mozilla/chrome/tools/chromereg/Makefile.in +++ b/mozilla/chrome/tools/chromereg/Makefile.in @@ -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/ +# ***** 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 ***** DEPTH = ../../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/chrome/tools/chromereg/regchrome.cpp b/mozilla/chrome/tools/chromereg/regchrome.cpp index bb29ad22bb5..6108eb91081 100644 --- a/mozilla/chrome/tools/chromereg/regchrome.cpp +++ b/mozilla/chrome/tools/chromereg/regchrome.cpp @@ -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/ - * - * 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 Christopher Blizzard. - * Portions created by Christopher Blizzard are Copyright (C) - * Christopher Blizzard. All Rights Reserved. - * + * + * The Initial Developer of the Original Code is + * Christopher Blizzard. + * Portions created by the Initial Developer are Copyright (C) 2004 + * 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 "nsIServiceManager.h" #include "nsCOMPtr.h" diff --git a/mozilla/content/events/src/nsDOMKeyboardEvent.cpp b/mozilla/content/events/src/nsDOMKeyboardEvent.cpp index 965ad726907..d358a0f9b89 100644 --- a/mozilla/content/events/src/nsDOMKeyboardEvent.cpp +++ b/mozilla/content/events/src/nsDOMKeyboardEvent.cpp @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -20,9 +20,8 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Steve Clark (buster@netscape.com) - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Steve Clark (buster@netscape.com) + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMKeyboardEvent.h b/mozilla/content/events/src/nsDOMKeyboardEvent.h index 9eef524731e..29fabaf3a93 100644 --- a/mozilla/content/events/src/nsDOMKeyboardEvent.h +++ b/mozilla/content/events/src/nsDOMKeyboardEvent.h @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -20,7 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMMouseEvent.cpp b/mozilla/content/events/src/nsDOMMouseEvent.cpp index dd94bb25bae..233e14aa653 100644 --- a/mozilla/content/events/src/nsDOMMouseEvent.cpp +++ b/mozilla/content/events/src/nsDOMMouseEvent.cpp @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -20,9 +20,8 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Steve Clark (buster@netscape.com) - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Steve Clark (buster@netscape.com) + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMMouseEvent.h b/mozilla/content/events/src/nsDOMMouseEvent.h index aa480fb6a7c..39ce1acbf76 100644 --- a/mozilla/content/events/src/nsDOMMouseEvent.h +++ b/mozilla/content/events/src/nsDOMMouseEvent.h @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -14,14 +14,13 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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): - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp b/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp index d9e7349bbfe..c942123c0c9 100644 --- a/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp +++ b/mozilla/content/events/src/nsDOMPopupBlockedEvent.cpp @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -20,9 +20,8 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Steve Clark (buster@netscape.com) - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Steve Clark (buster@netscape.com) + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMPopupBlockedEvent.h b/mozilla/content/events/src/nsDOMPopupBlockedEvent.h index 0f4d7b3abd9..c26bc686d1f 100644 --- a/mozilla/content/events/src/nsDOMPopupBlockedEvent.h +++ b/mozilla/content/events/src/nsDOMPopupBlockedEvent.h @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -14,14 +14,13 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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): - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMTextEvent.cpp b/mozilla/content/events/src/nsDOMTextEvent.cpp index 468946416d5..9f175365c58 100644 --- a/mozilla/content/events/src/nsDOMTextEvent.cpp +++ b/mozilla/content/events/src/nsDOMTextEvent.cpp @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -20,8 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMTextEvent.h b/mozilla/content/events/src/nsDOMTextEvent.h index 6575374c78a..f22ed8dc687 100644 --- a/mozilla/content/events/src/nsDOMTextEvent.h +++ b/mozilla/content/events/src/nsDOMTextEvent.h @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -20,7 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMUIEvent.cpp b/mozilla/content/events/src/nsDOMUIEvent.cpp index c50a43ef974..ee50c7a4f56 100644 --- a/mozilla/content/events/src/nsDOMUIEvent.cpp +++ b/mozilla/content/events/src/nsDOMUIEvent.cpp @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -20,9 +20,8 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Steve Clark (buster@netscape.com) - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Steve Clark (buster@netscape.com) + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsDOMUIEvent.h b/mozilla/content/events/src/nsDOMUIEvent.h index fe072c3b56f..09ba588072a 100644 --- a/mozilla/content/events/src/nsDOMUIEvent.h +++ b/mozilla/content/events/src/nsDOMUIEvent.h @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -14,14 +14,13 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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): - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/events/src/nsRecycled.h b/mozilla/content/events/src/nsRecycled.h index 0ffc4c7b81b..9602ed23876 100644 --- a/mozilla/content/events/src/nsRecycled.h +++ b/mozilla/content/events/src/nsRecycled.h @@ -2,9 +2,9 @@ /* ***** 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 + * 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, @@ -14,14 +14,13 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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): - * Ilya Konstantinov (mozilla-code@future.shiny.co.il) - * + * Ilya Konstantinov (mozilla-code@future.shiny.co.il) * * 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 diff --git a/mozilla/content/svg/content/src/nsSVGAnimatedNumber.cpp b/mozilla/content/svg/content/src/nsSVGAnimatedNumber.cpp index 9d4d4e1f4d4..8ef979e94ff 100644 --- a/mozilla/content/svg/content/src/nsSVGAnimatedNumber.cpp +++ b/mozilla/content/svg/content/src/nsSVGAnimatedNumber.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris (original author) + * Scooter Morris (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsSVGAnimatedNumber.h" #include "nsTextFormatter.h" diff --git a/mozilla/content/svg/content/src/nsSVGAnimatedNumber.h b/mozilla/content/svg/content/src/nsSVGAnimatedNumber.h index b253e0a34b2..95ff19638de 100644 --- a/mozilla/content/svg/content/src/nsSVGAnimatedNumber.h +++ b/mozilla/content/svg/content/src/nsSVGAnimatedNumber.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris (original author) + * Scooter Morris (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_SVGANIMATEDNUMBER_H__ #define __NS_SVGANIMATEDNUMBER_H__ diff --git a/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.cpp b/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.cpp index 4b9be8729b7..784682d383b 100644 --- a/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.cpp +++ b/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris (original author) + * Scooter Morris (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsSVGAnimatedNumberList.h" #include "nsSVGNumberList.h" diff --git a/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.h b/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.h index 55b83dacfd8..89a774373bb 100644 --- a/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.h +++ b/mozilla/content/svg/content/src/nsSVGAnimatedNumberList.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris (original author) + * Scooter Morris (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_SVGANIMATEDNUMBERLIST_H__ #define __NS_SVGANIMATEDNUMBERLIST_H__ diff --git a/mozilla/content/svg/content/src/nsSVGFeatures.cpp b/mozilla/content/svg/content/src/nsSVGFeatures.cpp index e730939b9ab..2a616726878 100644 --- a/mozilla/content/svg/content/src/nsSVGFeatures.cpp +++ b/mozilla/content/svg/content/src/nsSVGFeatures.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ // vim:cindent:ts=2:et:sw=2: -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -15,22 +15,27 @@ * * The Original Code is the Mozilla SVG project. * + * The Initial Developer of the Original Code is + * Scooter Morris . + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsString.h" diff --git a/mozilla/content/svg/content/src/nsSVGFeaturesList.h b/mozilla/content/svg/content/src/nsSVGFeaturesList.h index 7f657f7c76c..a9255749f01 100644 --- a/mozilla/content/svg/content/src/nsSVGFeaturesList.h +++ b/mozilla/content/svg/content/src/nsSVGFeaturesList.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,22 +14,27 @@ * * The Original Code is the Mozilla SVG project. * + * The Initial Developer of the Original Code is + * Scooter Morris . + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ // Features (SVG 1.1 style) diff --git a/mozilla/content/svg/content/src/nsSVGGradientElement.cpp b/mozilla/content/svg/content/src/nsSVGGradientElement.cpp index 6d395c55642..e793e56042a 100644 --- a/mozilla/content/svg/content/src/nsSVGGradientElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGGradientElement.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsSVGLength.h" #include "nsSVGAnimatedLength.h" diff --git a/mozilla/content/svg/content/src/nsSVGNumberList.cpp b/mozilla/content/svg/content/src/nsSVGNumberList.cpp index 80028eab60b..867c88e99bc 100644 --- a/mozilla/content/svg/content/src/nsSVGNumberList.cpp +++ b/mozilla/content/svg/content/src/nsSVGNumberList.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsSVGNumberList.h" #include "nsSVGNumber.h" diff --git a/mozilla/content/svg/content/src/nsSVGNumberList.h b/mozilla/content/svg/content/src/nsSVGNumberList.h index 3a1d1b95d06..9d69776a5dd 100644 --- a/mozilla/content/svg/content/src/nsSVGNumberList.h +++ b/mozilla/content/svg/content/src/nsSVGNumberList.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_SVGNUMBERLIST_H__ #define __NS_SVGNUMBERLIST_H__ diff --git a/mozilla/content/svg/content/src/nsSVGStopElement.cpp b/mozilla/content/svg/content/src/nsSVGStopElement.cpp index 727c63539a1..33201a633db 100644 --- a/mozilla/content/svg/content/src/nsSVGStopElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGStopElement.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsSVGStylableElement.h" #include "nsSVGAtoms.h" diff --git a/mozilla/content/svg/content/src/nsSVGStyleElement.cpp b/mozilla/content/svg/content/src/nsSVGStyleElement.cpp index 426970c2d62..1b74afd6365 100644 --- a/mozilla/content/svg/content/src/nsSVGStyleElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGStyleElement.cpp @@ -12,7 +12,7 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code the Mozilla SVG project. + * The Original Code is the Mozilla SVG project. * * The Initial Developer of the Original Code is * IBM Corporation. @@ -23,7 +23,7 @@ * IBM Corporation (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 diff --git a/mozilla/content/xtf/public/nsIXMLContentBuilder.idl b/mozilla/content/xtf/public/nsIXMLContentBuilder.idl index 45e82f3b271..347cc11e8b5 100644 --- a/mozilla/content/xtf/public/nsIXMLContentBuilder.idl +++ b/mozilla/content/xtf/public/nsIXMLContentBuilder.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" diff --git a/mozilla/content/xtf/public/nsIXTFAttributeHandler.idl b/mozilla/content/xtf/public/nsIXTFAttributeHandler.idl index 3fabd733fee..d4073159a08 100644 --- a/mozilla/content/xtf/public/nsIXTFAttributeHandler.idl +++ b/mozilla/content/xtf/public/nsIXTFAttributeHandler.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" interface nsIAtom; diff --git a/mozilla/content/xtf/public/nsIXTFElement.idl b/mozilla/content/xtf/public/nsIXTFElement.idl index 8dd2d9bc5f6..e6cd31e7d33 100644 --- a/mozilla/content/xtf/public/nsIXTFElement.idl +++ b/mozilla/content/xtf/public/nsIXTFElement.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" interface nsIAtom; diff --git a/mozilla/content/xtf/public/nsIXTFElementFactory.idl b/mozilla/content/xtf/public/nsIXTFElementFactory.idl index a998850d154..6bde502c3df 100644 --- a/mozilla/content/xtf/public/nsIXTFElementFactory.idl +++ b/mozilla/content/xtf/public/nsIXTFElementFactory.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" diff --git a/mozilla/content/xtf/public/nsIXTFElementWrapper.idl b/mozilla/content/xtf/public/nsIXTFElementWrapper.idl index e40c3f45ed2..06e8f542592 100644 --- a/mozilla/content/xtf/public/nsIXTFElementWrapper.idl +++ b/mozilla/content/xtf/public/nsIXTFElementWrapper.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" diff --git a/mozilla/content/xtf/public/nsIXTFGenericElement.idl b/mozilla/content/xtf/public/nsIXTFGenericElement.idl index 73ebea11617..7a3b3d6b881 100644 --- a/mozilla/content/xtf/public/nsIXTFGenericElement.idl +++ b/mozilla/content/xtf/public/nsIXTFGenericElement.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFElement.idl" diff --git a/mozilla/content/xtf/public/nsIXTFGenericElementWrapper.idl b/mozilla/content/xtf/public/nsIXTFGenericElementWrapper.idl index ddf4b17ad0f..0cef78b4157 100644 --- a/mozilla/content/xtf/public/nsIXTFGenericElementWrapper.idl +++ b/mozilla/content/xtf/public/nsIXTFGenericElementWrapper.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFElementWrapper.idl" diff --git a/mozilla/content/xtf/public/nsIXTFPrivate.idl b/mozilla/content/xtf/public/nsIXTFPrivate.idl index 047017be845..2c40471d3b0 100644 --- a/mozilla/content/xtf/public/nsIXTFPrivate.idl +++ b/mozilla/content/xtf/public/nsIXTFPrivate.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsISupports.idl" diff --git a/mozilla/content/xtf/public/nsIXTFSVGVisual.idl b/mozilla/content/xtf/public/nsIXTFSVGVisual.idl index 89a6adf60e2..0d2c484a572 100644 --- a/mozilla/content/xtf/public/nsIXTFSVGVisual.idl +++ b/mozilla/content/xtf/public/nsIXTFSVGVisual.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFVisual.idl" diff --git a/mozilla/content/xtf/public/nsIXTFSVGVisualWrapper.idl b/mozilla/content/xtf/public/nsIXTFSVGVisualWrapper.idl index b0d997eca3c..f6198fba8c9 100644 --- a/mozilla/content/xtf/public/nsIXTFSVGVisualWrapper.idl +++ b/mozilla/content/xtf/public/nsIXTFSVGVisualWrapper.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFElementWrapper.idl" diff --git a/mozilla/content/xtf/public/nsIXTFVisual.idl b/mozilla/content/xtf/public/nsIXTFVisual.idl index b9a6c9a2b27..d980ff2e5d8 100644 --- a/mozilla/content/xtf/public/nsIXTFVisual.idl +++ b/mozilla/content/xtf/public/nsIXTFVisual.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFElement.idl" diff --git a/mozilla/content/xtf/public/nsIXTFXMLVisual.idl b/mozilla/content/xtf/public/nsIXTFXMLVisual.idl index be8e91a5c40..aba18bc95c9 100644 --- a/mozilla/content/xtf/public/nsIXTFXMLVisual.idl +++ b/mozilla/content/xtf/public/nsIXTFXMLVisual.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFVisual.idl" diff --git a/mozilla/content/xtf/public/nsIXTFXMLVisualWrapper.idl b/mozilla/content/xtf/public/nsIXTFXMLVisualWrapper.idl index 924c1f49f23..e645314d95c 100644 --- a/mozilla/content/xtf/public/nsIXTFXMLVisualWrapper.idl +++ b/mozilla/content/xtf/public/nsIXTFXMLVisualWrapper.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFElementWrapper.idl" diff --git a/mozilla/content/xtf/public/nsIXTFXULVisual.idl b/mozilla/content/xtf/public/nsIXTFXULVisual.idl index 3d7fa538c2e..f4394a4c039 100644 --- a/mozilla/content/xtf/public/nsIXTFXULVisual.idl +++ b/mozilla/content/xtf/public/nsIXTFXULVisual.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFVisual.idl" diff --git a/mozilla/content/xtf/public/nsIXTFXULVisualWrapper.idl b/mozilla/content/xtf/public/nsIXTFXULVisualWrapper.idl index 2f3f477adb1..01d23d9f047 100644 --- a/mozilla/content/xtf/public/nsIXTFXULVisualWrapper.idl +++ b/mozilla/content/xtf/public/nsIXTFXULVisualWrapper.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIXTFElementWrapper.idl" diff --git a/mozilla/content/xtf/src/Makefile.in b/mozilla/content/xtf/src/Makefile.in index 1de4194ebc6..ebbccf7de85 100644 --- a/mozilla/content/xtf/src/Makefile.in +++ b/mozilla/content/xtf/src/Makefile.in @@ -1,3 +1,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 @@ -18,7 +19,7 @@ # the Initial Developer. All Rights Reserved. # # Contributor(s): -# Alex Fritze (original author) +# Alex Fritze (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 diff --git a/mozilla/content/xtf/src/nsIXTFElementWrapperPrivate.h b/mozilla/content/xtf/src/nsIXTFElementWrapperPrivate.h index c309852210b..c65de56d150 100644 --- a/mozilla/content/xtf/src/nsIXTFElementWrapperPrivate.h +++ b/mozilla/content/xtf/src/nsIXTFElementWrapperPrivate.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_IXTFELEMENTWRAPPERPRIVATE_H__ #define __NS_IXTFELEMENTWRAPPERPRIVATE_H__ diff --git a/mozilla/content/xtf/src/nsIXTFService.h b/mozilla/content/xtf/src/nsIXTFService.h index 6be3c0f2afb..ee2df5b5319 100644 --- a/mozilla/content/xtf/src/nsIXTFService.h +++ b/mozilla/content/xtf/src/nsIXTFService.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_IXTFSERVICE_H__ #define __NS_IXTFSERVICE_H__ diff --git a/mozilla/content/xtf/src/nsIXTFVisualWrapperPrivate.h b/mozilla/content/xtf/src/nsIXTFVisualWrapperPrivate.h index fd734a2db02..0bf8b243d52 100644 --- a/mozilla/content/xtf/src/nsIXTFVisualWrapperPrivate.h +++ b/mozilla/content/xtf/src/nsIXTFVisualWrapperPrivate.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_IXTFVISUALWRAPPERPRIVATE_H__ #define __NS_IXTFVISUALWRAPPERPRIVATE_H__ diff --git a/mozilla/content/xtf/src/nsXMLContentBuilder.cpp b/mozilla/content/xtf/src/nsXMLContentBuilder.cpp index a9f9b40f0f5..3a7a7010924 100644 --- a/mozilla/content/xtf/src/nsXMLContentBuilder.cpp +++ b/mozilla/content/xtf/src/nsXMLContentBuilder.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsString.h" diff --git a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp index 906c2e474dd..2966a2b7c7e 100644 --- a/mozilla/content/xtf/src/nsXTFElementWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFElementWrapper.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsXTFElementWrapper.h" #include "nsIXTFElement.h" diff --git a/mozilla/content/xtf/src/nsXTFElementWrapper.h b/mozilla/content/xtf/src/nsXTFElementWrapper.h index 10d9f5281d1..87fa5fa592a 100644 --- a/mozilla/content/xtf/src/nsXTFElementWrapper.h +++ b/mozilla/content/xtf/src/nsXTFElementWrapper.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFELEMENTWRAPPER_H__ #define __NS_XTFELEMENTWRAPPER_H__ diff --git a/mozilla/content/xtf/src/nsXTFGenericElementWrapper.cpp b/mozilla/content/xtf/src/nsXTFGenericElementWrapper.cpp index 096caa2af6d..5db4195c0e8 100644 --- a/mozilla/content/xtf/src/nsXTFGenericElementWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFGenericElementWrapper.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsXTFElementWrapper.h" diff --git a/mozilla/content/xtf/src/nsXTFGenericElementWrapper.h b/mozilla/content/xtf/src/nsXTFGenericElementWrapper.h index b1dd5bac97a..851054cb623 100644 --- a/mozilla/content/xtf/src/nsXTFGenericElementWrapper.h +++ b/mozilla/content/xtf/src/nsXTFGenericElementWrapper.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFGENERICELEMENTWRAPPER_H__ #define __NS_XTFGENERICELEMENTWRAPPER_H__ diff --git a/mozilla/content/xtf/src/nsXTFInterfaceAggregator.cpp b/mozilla/content/xtf/src/nsXTFInterfaceAggregator.cpp index 07f168e155e..c457e6eef9a 100644 --- a/mozilla/content/xtf/src/nsXTFInterfaceAggregator.cpp +++ b/mozilla/content/xtf/src/nsXTFInterfaceAggregator.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "xptcall.h" diff --git a/mozilla/content/xtf/src/nsXTFInterfaceAggregator.h b/mozilla/content/xtf/src/nsXTFInterfaceAggregator.h index 06f0a125382..72398b80956 100644 --- a/mozilla/content/xtf/src/nsXTFInterfaceAggregator.h +++ b/mozilla/content/xtf/src/nsXTFInterfaceAggregator.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFINTERFACEAGGREGATOR_H__ #define __NS_XTFINTERFACEAGGREGATOR_H__ diff --git a/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.cpp b/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.cpp index f5c003539d0..41b0d27b55a 100644 --- a/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsXTFVisualWrapper.h" diff --git a/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.h b/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.h index 867e0aca4c3..e082dd76aa5 100644 --- a/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.h +++ b/mozilla/content/xtf/src/nsXTFSVGVisualWrapper.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFSVGVISUALWRAPPER_H__ #define __NS_XTFSVGVISUALWRAPPER_H__ diff --git a/mozilla/content/xtf/src/nsXTFService.cpp b/mozilla/content/xtf/src/nsXTFService.cpp index 0372a98f0a3..2a7e7fd4c2a 100644 --- a/mozilla/content/xtf/src/nsXTFService.cpp +++ b/mozilla/content/xtf/src/nsXTFService.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsINodeInfo.h" diff --git a/mozilla/content/xtf/src/nsXTFVisualWrapper.cpp b/mozilla/content/xtf/src/nsXTFVisualWrapper.cpp index fe3f6f5c9f1..5e5af1355ec 100644 --- a/mozilla/content/xtf/src/nsXTFVisualWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFVisualWrapper.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsXTFVisualWrapper.h" diff --git a/mozilla/content/xtf/src/nsXTFVisualWrapper.h b/mozilla/content/xtf/src/nsXTFVisualWrapper.h index 61e8825b9bb..7487b6cf994 100644 --- a/mozilla/content/xtf/src/nsXTFVisualWrapper.h +++ b/mozilla/content/xtf/src/nsXTFVisualWrapper.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFVISUALWRAPPER_H__ #define __NS_XTFVISUALWRAPPER_H__ diff --git a/mozilla/content/xtf/src/nsXTFWeakTearoff.cpp b/mozilla/content/xtf/src/nsXTFWeakTearoff.cpp index 4dbba622f65..2ba54c0f279 100644 --- a/mozilla/content/xtf/src/nsXTFWeakTearoff.cpp +++ b/mozilla/content/xtf/src/nsXTFWeakTearoff.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "xptcall.h" diff --git a/mozilla/content/xtf/src/nsXTFWeakTearoff.h b/mozilla/content/xtf/src/nsXTFWeakTearoff.h index 64db4506ef9..98d9f1fd2ce 100644 --- a/mozilla/content/xtf/src/nsXTFWeakTearoff.h +++ b/mozilla/content/xtf/src/nsXTFWeakTearoff.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFWEAKTEAROFF_H__ #define __NS_XTFWEAKTEAROFF_H__ diff --git a/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.cpp b/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.cpp index 3a2aff449c8..9767e9a8aae 100644 --- a/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsXTFVisualWrapper.h" diff --git a/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.h b/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.h index 0f0509b5198..0f564ca027c 100644 --- a/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.h +++ b/mozilla/content/xtf/src/nsXTFXMLVisualWrapper.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFXMLVISUALWRAPPER_H__ #define __NS_XTFXMLVISUALWRAPPER_H__ diff --git a/mozilla/content/xtf/src/nsXTFXULVisualWrapper.cpp b/mozilla/content/xtf/src/nsXTFXULVisualWrapper.cpp index 0d7e5d5b807..f0eb7b09372 100644 --- a/mozilla/content/xtf/src/nsXTFXULVisualWrapper.cpp +++ b/mozilla/content/xtf/src/nsXTFXULVisualWrapper.cpp @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsCOMPtr.h" #include "nsXTFVisualWrapper.h" diff --git a/mozilla/content/xtf/src/nsXTFXULVisualWrapper.h b/mozilla/content/xtf/src/nsXTFXULVisualWrapper.h index 3ba0afc264a..0631bd71376 100644 --- a/mozilla/content/xtf/src/nsXTFXULVisualWrapper.h +++ b/mozilla/content/xtf/src/nsXTFXULVisualWrapper.h @@ -1,10 +1,10 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla XTF project. * - * The Initial Developer of the Original Code is + * The Initial Developer of the Original Code is * Alex Fritze. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Alex Fritze (original author) + * Alex Fritze (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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #ifndef __NS_XTFXULVISUALWRAPPER_H__ #define __NS_XTFXULVISUALWRAPPER_H__ diff --git a/mozilla/dom/public/idl/svg/nsIDOMSVGAnimatedNumber.idl b/mozilla/dom/public/idl/svg/nsIDOMSVGAnimatedNumber.idl index 54c7835bb06..00efecf1754 100644 --- a/mozilla/dom/public/idl/svg/nsIDOMSVGAnimatedNumber.idl +++ b/mozilla/dom/public/idl/svg/nsIDOMSVGAnimatedNumber.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "domstubs.idl" diff --git a/mozilla/dom/public/idl/svg/nsIDOMSVGGradientElement.idl b/mozilla/dom/public/idl/svg/nsIDOMSVGGradientElement.idl index 80c7eefd092..40ce4324da9 100644 --- a/mozilla/dom/public/idl/svg/nsIDOMSVGGradientElement.idl +++ b/mozilla/dom/public/idl/svg/nsIDOMSVGGradientElement.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIDOMSVGElement.idl" diff --git a/mozilla/dom/public/idl/svg/nsIDOMSVGStopElement.idl b/mozilla/dom/public/idl/svg/nsIDOMSVGStopElement.idl index 2fd3afca2fb..1faae9e2283 100644 --- a/mozilla/dom/public/idl/svg/nsIDOMSVGStopElement.idl +++ b/mozilla/dom/public/idl/svg/nsIDOMSVGStopElement.idl @@ -1,10 +1,10 @@ /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* ----- BEGIN LICENSE BLOCK ----- +/* ***** 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 + * 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, @@ -14,27 +14,27 @@ * * The Original Code is the Mozilla SVG project. * - * The Initial Developer of the Original Code is - * Scooter Morris + * The Initial Developer of the Original Code is + * Scooter Morris. * Portions created by the Initial Developer are Copyright (C) 2004 * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Scooter Morris + * Scooter Morris * * 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 MPL, the GPL or the LGPL. * - * ----- END LICENSE BLOCK ----- */ + * ***** END LICENSE BLOCK ***** */ #include "nsIDOMSVGElement.idl" diff --git a/mozilla/embedding/browser/cocoa/src/CHBrowserService.mm b/mozilla/embedding/browser/cocoa/src/CHBrowserService.mm index fd659b35f12..415b348eeeb 100644 --- a/mozilla/embedding/browser/cocoa/src/CHBrowserService.mm +++ b/mozilla/embedding/browser/cocoa/src/CHBrowserService.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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/embedding/browser/cocoa/src/CHBrowserView.mm b/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm index 0f75bdb1ac6..1fc9a670bb5 100644 --- a/mozilla/embedding/browser/cocoa/src/CHBrowserView.mm +++ b/mozilla/embedding/browser/cocoa/src/CHBrowserView.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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/embedding/browser/cocoa/src/NSBrowserView.mm b/mozilla/embedding/browser/cocoa/src/NSBrowserView.mm index e06025085df..64df054c2c3 100644 --- a/mozilla/embedding/browser/cocoa/src/NSBrowserView.mm +++ b/mozilla/embedding/browser/cocoa/src/NSBrowserView.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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/embedding/browser/cocoa/src/ProgressDlgController.mm b/mozilla/embedding/browser/cocoa/src/ProgressDlgController.mm index a9b304cc93d..a084295fcfb 100644 --- a/mozilla/embedding/browser/cocoa/src/ProgressDlgController.mm +++ b/mozilla/embedding/browser/cocoa/src/ProgressDlgController.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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/embedding/browser/cocoa/src/nsAlertController.mm b/mozilla/embedding/browser/cocoa/src/nsAlertController.mm index 49c2dc041c5..15b368a0710 100644 --- a/mozilla/embedding/browser/cocoa/src/nsAlertController.mm +++ b/mozilla/embedding/browser/cocoa/src/nsAlertController.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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/embedding/browser/cocoa/src/nsCocoaBrowserService.mm b/mozilla/embedding/browser/cocoa/src/nsCocoaBrowserService.mm index 101c57dd032..b9012ffbfc6 100644 --- a/mozilla/embedding/browser/cocoa/src/nsCocoaBrowserService.mm +++ b/mozilla/embedding/browser/cocoa/src/nsCocoaBrowserService.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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/embedding/browser/cocoa/src/nsDownloadListener.mm b/mozilla/embedding/browser/cocoa/src/nsDownloadListener.mm index a17116a677a..f27c3528211 100644 --- a/mozilla/embedding/browser/cocoa/src/nsDownloadListener.mm +++ b/mozilla/embedding/browser/cocoa/src/nsDownloadListener.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,26 +14,25 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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): - * Simon Fraser - * + * 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 + * 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/qa/jstests/content/nsISelection.html b/mozilla/embedding/qa/jstests/content/nsISelection.html index e7dd6e8e4ee..f8f235a57e8 100644 --- a/mozilla/embedding/qa/jstests/content/nsISelection.html +++ b/mozilla/embedding/qa/jstests/content/nsISelection.html @@ -1,44 +1,40 @@ - - + nsISelection Tets case diff --git a/mozilla/embedding/qa/jstests/dom/nsIDOMWindow.html b/mozilla/embedding/qa/jstests/dom/nsIDOMWindow.html index 5f5b769e2ef..15a4b2e9371 100644 --- a/mozilla/embedding/qa/jstests/dom/nsIDOMWindow.html +++ b/mozilla/embedding/qa/jstests/dom/nsIDOMWindow.html @@ -1,44 +1,40 @@ - - + diff --git a/mozilla/embedding/qa/jstests/networking/nsIURI.html b/mozilla/embedding/qa/jstests/networking/nsIURI.html index 0fc6037572e..b64dfa4d309 100644 --- a/mozilla/embedding/qa/jstests/networking/nsIURI.html +++ b/mozilla/embedding/qa/jstests/networking/nsIURI.html @@ -20,6 +20,7 @@ - - Contributor(s): - Ashish Bhatt + - - 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"), diff --git a/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties b/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties index 89bc9cf4811..f8dfad8f9e6 100644 --- a/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties +++ b/mozilla/extensions/irc/xul/locale/en-US/chatzilla.properties @@ -19,9 +19,9 @@ # 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 +# 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 diff --git a/mozilla/extensions/python/xpcom/tools/tracer_demo.py b/mozilla/extensions/python/xpcom/tools/tracer_demo.py index cc37299580d..045c3db84d4 100644 --- a/mozilla/extensions/python/xpcom/tools/tracer_demo.py +++ b/mozilla/extensions/python/xpcom/tools/tracer_demo.py @@ -15,7 +15,7 @@ # # The Initial Developer of the Original Code is # ActiveState Tool Corp. -# Portions created by the Initial Developer are Copyright (C) 2000 +# Portions created by the Initial Developer are Copyright (C) 2000, 2001 # the Initial Developer. All Rights Reserved. # # Contributor(s): @@ -34,22 +34,6 @@ # 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/ -# -# 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 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. -# -# Contributor(s): Mark Hammond (original author) -# # This is a demo is how to use the xpcom.server "tracer" facility. # @@ -126,4 +110,4 @@ def test(): for name, num in setters.items(): print "%-30s%d" % (name, num) -test() \ No newline at end of file +test() diff --git a/mozilla/extensions/transformiix/source/examples/identity.xsl b/mozilla/extensions/transformiix/source/examples/identity.xsl index 7acbfdc5cff..7493ffa8119 100644 --- a/mozilla/extensions/transformiix/source/examples/identity.xsl +++ b/mozilla/extensions/transformiix/source/examples/identity.xsl @@ -1,41 +1,41 @@ - + + +/* ***** 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. + * + * Contributor(s): + * Conrad Carlen + * + * 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"), + * 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/Prefix.h b/mozilla/lib/mac/PowerPlant/pch/Prefix.h index 9ff3ef1b971..5a7eab3cfc8 100644 --- a/mozilla/lib/mac/PowerPlant/pch/Prefix.h +++ b/mozilla/lib/mac/PowerPlant/pch/Prefix.h @@ -1,40 +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 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) 2002 -* the Initial Developer. 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 ***** */ + * 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) 2002 + * the Initial Developer. 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 ***** */ // PowerPlant Config #define PP_Target_Carbon 1 diff --git a/mozilla/mailnews/addrbook/src/nsAbView.cpp b/mozilla/mailnews/addrbook/src/nsAbView.cpp index c198c56894c..270e16aeaa4 100644 --- a/mozilla/mailnews/addrbook/src/nsAbView.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbView.cpp @@ -20,11 +20,11 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Paul Sandoz + * Paul Sandoz * * 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"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * 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 diff --git a/mozilla/mailnews/base/prefs/resources/content/am-identities-list.js b/mozilla/mailnews/base/prefs/resources/content/am-identities-list.js index ba4dde40319..e7caa566155 100644 --- a/mozilla/mailnews/base/prefs/resources/content/am-identities-list.js +++ b/mozilla/mailnews/base/prefs/resources/content/am-identities-list.js @@ -14,6 +14,11 @@ * * The Original Code is Mozilla Mail Code. * + * The Initial Developer of the Original Code is + * Scott MacGregor. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * Scott MacGregor * diff --git a/mozilla/mailnews/base/prefs/resources/content/am-identities-list.xul b/mozilla/mailnews/base/prefs/resources/content/am-identities-list.xul index 9c2f90ba687..a40c18d2308 100644 --- a/mozilla/mailnews/base/prefs/resources/content/am-identities-list.xul +++ b/mozilla/mailnews/base/prefs/resources/content/am-identities-list.xul @@ -17,6 +17,11 @@ The Original Code is Mozilla Mail Code. + The Initial Developer of the Original Code is + David Bienvenu. + Portions created by the Initial Developer are Copyright (C) 2004 + the Initial Developer. All Rights Reserved. + Contributor(s): Scott MacGregor diff --git a/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.js b/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.js index 3985b566e31..03ad69677b0 100644 --- a/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.js +++ b/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.js @@ -14,6 +14,11 @@ * * The Original Code is Mozilla Mail Code. * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * Scott MacGregor * diff --git a/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.xul b/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.xul index 3fae02bc299..d0d037e0df0 100644 --- a/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.xul +++ b/mozilla/mailnews/base/prefs/resources/content/am-identity-edit.xul @@ -17,6 +17,11 @@ The Original Code is Mozilla Mail Code. + The Initial Developer of the Original Code is + David Bienvenu. + Portions created by the Initial Developer are Copyright (C) 2004 + the Initial Developer. All Rights Reserved. + Contributor(s): Scott MacGregor diff --git a/mozilla/mailnews/base/resources/content/virtualFolderListDialog.js b/mozilla/mailnews/base/resources/content/virtualFolderListDialog.js index b38e43e3618..e0585eb2e12 100644 --- a/mozilla/mailnews/base/resources/content/virtualFolderListDialog.js +++ b/mozilla/mailnews/base/resources/content/virtualFolderListDialog.js @@ -14,6 +14,10 @@ * * The Original Code is the virtual folder properties dialog * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * David Bienvenu diff --git a/mozilla/mailnews/base/resources/content/virtualFolderName.js b/mozilla/mailnews/base/resources/content/virtualFolderName.js index 15987c7e1af..0be30c88309 100755 --- a/mozilla/mailnews/base/resources/content/virtualFolderName.js +++ b/mozilla/mailnews/base/resources/content/virtualFolderName.js @@ -15,6 +15,11 @@ * * The Original Code is Mozilla.org code * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * David Bienvenu * diff --git a/mozilla/mailnews/base/resources/content/virtualFolderName.xul b/mozilla/mailnews/base/resources/content/virtualFolderName.xul index 87d09f3b655..756d7c2a757 100755 --- a/mozilla/mailnews/base/resources/content/virtualFolderName.xul +++ b/mozilla/mailnews/base/resources/content/virtualFolderName.xul @@ -1,37 +1,41 @@ + - ***** 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 + - David Bienvenu. + - Portions created by the Initial Developer are Copyright (C) 2004 + - the Initial Developer. All Rights Reserved. + - + - Contributor(s): + - David Bienvenu + - + - 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"), + - 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/mailnews/base/resources/content/virtualFolderProperties.js b/mozilla/mailnews/base/resources/content/virtualFolderProperties.js index acc828ba4f2..59ea2eb273e 100644 --- a/mozilla/mailnews/base/resources/content/virtualFolderProperties.js +++ b/mozilla/mailnews/base/resources/content/virtualFolderProperties.js @@ -14,6 +14,10 @@ * * The Original Code is the virtual folder properties dialog * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * David Bienvenu diff --git a/mozilla/mailnews/base/resources/locale/en-US/virtualFolderName.dtd b/mozilla/mailnews/base/resources/locale/en-US/virtualFolderName.dtd index ec7fe59bce1..f59e61b1157 100644 --- a/mozilla/mailnews/base/resources/locale/en-US/virtualFolderName.dtd +++ b/mozilla/mailnews/base/resources/locale/en-US/virtualFolderName.dtd @@ -1,19 +1,39 @@ - + diff --git a/mozilla/mailnews/base/src/nsMsgGroupThread.cpp b/mozilla/mailnews/base/src/nsMsgGroupThread.cpp index 9ba8c01edde..b2f7114345d 100755 --- a/mozilla/mailnews/base/src/nsMsgGroupThread.cpp +++ b/mozilla/mailnews/base/src/nsMsgGroupThread.cpp @@ -14,6 +14,11 @@ * * The Original Code is mozilla.org code. * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * David Bienvenu * diff --git a/mozilla/mailnews/base/src/nsMsgGroupThread.h b/mozilla/mailnews/base/src/nsMsgGroupThread.h index 01c40cea721..903f04b3d6a 100755 --- a/mozilla/mailnews/base/src/nsMsgGroupThread.h +++ b/mozilla/mailnews/base/src/nsMsgGroupThread.h @@ -14,6 +14,11 @@ * * The Original Code is mozilla.org code. * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * David Bienvenu * diff --git a/mozilla/mailnews/base/src/nsMsgGroupView.cpp b/mozilla/mailnews/base/src/nsMsgGroupView.cpp index 129141cbe3d..255faebfcfe 100755 --- a/mozilla/mailnews/base/src/nsMsgGroupView.cpp +++ b/mozilla/mailnews/base/src/nsMsgGroupView.cpp @@ -14,6 +14,11 @@ * * The Original Code is mozilla.org code. * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of diff --git a/mozilla/mailnews/base/src/nsMsgGroupView.h b/mozilla/mailnews/base/src/nsMsgGroupView.h index d4cf2e75717..04e394d29ab 100755 --- a/mozilla/mailnews/base/src/nsMsgGroupView.h +++ b/mozilla/mailnews/base/src/nsMsgGroupView.h @@ -14,6 +14,11 @@ * * The Original Code is mozilla.org code. * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * David Bienvenu * diff --git a/mozilla/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp b/mozilla/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp index 6874ea03edd..5b24c098376 100755 --- a/mozilla/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp +++ b/mozilla/mailnews/base/src/nsMsgXFVirtualFolderDBView.cpp @@ -14,6 +14,11 @@ * * The Original Code is mozilla.org code. * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * * Contributor(s): * David Bienvenu * diff --git a/mozilla/mailnews/extensions/bayesian-spam-filter/src/nsIncompleteGamma.h b/mozilla/mailnews/extensions/bayesian-spam-filter/src/nsIncompleteGamma.h index f94abd8952a..b984312899a 100644 --- a/mozilla/mailnews/extensions/bayesian-spam-filter/src/nsIncompleteGamma.h +++ b/mozilla/mailnews/extensions/bayesian-spam-filter/src/nsIncompleteGamma.h @@ -14,6 +14,8 @@ The Original Code is bayesian spam filter + The Initial Developer of the Original Code is + Scott MacGregor. Portions created by the Initial Developer are Copyright (C) 2004 the Initial Developer. All Rights Reserved. diff --git a/mozilla/mailnews/extensions/offline-startup/js/offlineStartup.js b/mozilla/mailnews/extensions/offline-startup/js/offlineStartup.js index a08a4af307e..8b376b5c1b5 100644 --- a/mozilla/mailnews/extensions/offline-startup/js/offlineStartup.js +++ b/mozilla/mailnews/extensions/offline-startup/js/offlineStartup.js @@ -14,6 +14,10 @@ * * The Original Code is the Offline Startup Handler * + * The Initial Developer of the Original Code is + * David Bienvenu. + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * David Bienvenu (Original Author) diff --git a/mozilla/mailnews/local/src/nsNoneService.cpp b/mozilla/mailnews/local/src/nsNoneService.cpp index d1c93b0d60d..33cc59602ba 100644 --- a/mozilla/mailnews/local/src/nsNoneService.cpp +++ b/mozilla/mailnews/local/src/nsNoneService.cpp @@ -20,12 +20,12 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Seth Spitzer - * David Bienvenu + * Seth Spitzer + * David Bienvenu * * 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"), - * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * 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 diff --git a/mozilla/mailnews/local/src/nsRssIncomingServer.cpp b/mozilla/mailnews/local/src/nsRssIncomingServer.cpp index ab1dc464f72..0341a48ad47 100755 --- a/mozilla/mailnews/local/src/nsRssIncomingServer.cpp +++ b/mozilla/mailnews/local/src/nsRssIncomingServer.cpp @@ -19,7 +19,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * David Bienvenu + * David Bienvenu * * 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 diff --git a/mozilla/mailnews/local/src/nsRssService.cpp b/mozilla/mailnews/local/src/nsRssService.cpp index 7527d5bdb9d..c90faf95871 100755 --- a/mozilla/mailnews/local/src/nsRssService.cpp +++ b/mozilla/mailnews/local/src/nsRssService.cpp @@ -1,38 +1,38 @@ /* ***** 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 mailnews. -* -* The Initial Developer of the Original Code is -* Seth Spitzer . -* Portions created by the Initial Developer are Copyright (C) 2004 -* 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 ***** */ + * 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 mailnews. + * + * The Initial Developer of the Original Code is + * Seth Spitzer . + * Portions created by the Initial Developer are Copyright (C) 2004 + * 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 "nsRssService.h" #include "nsIRssIncomingServer.h" diff --git a/mozilla/mailnews/mime/public/nsIMimeConverter.idl b/mozilla/mailnews/mime/public/nsIMimeConverter.idl index 6f8a8363502..b365a2691da 100644 --- a/mozilla/mailnews/mime/public/nsIMimeConverter.idl +++ b/mozilla/mailnews/mime/public/nsIMimeConverter.idl @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/modules/plugin/samples/SanePlugin/Makefile.in b/mozilla/modules/plugin/samples/SanePlugin/Makefile.in index 6a41e6b09f2..33ea34e0aed 100644 --- a/mozilla/modules/plugin/samples/SanePlugin/Makefile.in +++ b/mozilla/modules/plugin/samples/SanePlugin/Makefile.in @@ -1,19 +1,43 @@ -############################################################################ -## Makefile.in (Generic SANE Plugin Tree) -## -## 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. -## Contributor(s): -## -## Rusty Lynch -############################################################################ +# ***** 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 +# Rusty Lynch +# Portions created by the Initial Developer are Copyright (C) 2004 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Rusty Lynch +# +# 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 ***** + +###################################### +# Makefile.in (Generic SANE Plugin Tree) +###################################### DEPTH = ../../../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/modules/plugin/samples/unixprinting/Makefile.in b/mozilla/modules/plugin/samples/unixprinting/Makefile.in index c33e0fae783..afffa86ac6c 100644 --- a/mozilla/modules/plugin/samples/unixprinting/Makefile.in +++ b/mozilla/modules/plugin/samples/unixprinting/Makefile.in @@ -11,6 +11,8 @@ # 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 # Dantifer Dang . # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/modules/plugin/samples/unixprinting/npprint.pkg b/mozilla/modules/plugin/samples/unixprinting/npprint.pkg index 2fd018ac9ba..bf50a504fc6 100644 --- a/mozilla/modules/plugin/samples/unixprinting/npprint.pkg +++ b/mozilla/modules/plugin/samples/unixprinting/npprint.pkg @@ -11,6 +11,8 @@ # 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 # Dantifer Dang . # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/modules/plugin/samples/unixprinting/printplugin.c b/mozilla/modules/plugin/samples/unixprinting/printplugin.c index 8213aee5c0a..19adea13628 100644 --- a/mozilla/modules/plugin/samples/unixprinting/printplugin.c +++ b/mozilla/modules/plugin/samples/unixprinting/printplugin.c @@ -11,6 +11,8 @@ * 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 * Dantifer Dang . * Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/modules/plugin/samples/unixprinting/printplugin.h b/mozilla/modules/plugin/samples/unixprinting/printplugin.h index c0b8052eff6..f94d1decccd 100644 --- a/mozilla/modules/plugin/samples/unixprinting/printplugin.h +++ b/mozilla/modules/plugin/samples/unixprinting/printplugin.h @@ -11,6 +11,8 @@ * 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 * Dantifer Dang . * Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/parser/htmlparser/tests/html/bug23680.html b/mozilla/parser/htmlparser/tests/html/bug23680.html index 6274897ab63..878cb798278 100644 --- a/mozilla/parser/htmlparser/tests/html/bug23680.html +++ b/mozilla/parser/htmlparser/tests/html/bug23680.html @@ -1,3 +1,39 @@ + + bug23680 diff --git a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif index f3472d1f08c..98f47c7055b 100644 --- a/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif +++ b/mozilla/parser/htmlparser/tests/outsinks/xifstuff.xif @@ -13,41 +13,41 @@ - -- ***** 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 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/webshell/tests/viewer/unix/qt/Makefile.in b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in index d754679cfb4..ef9a306b604 100644 --- a/mozilla/webshell/tests/viewer/unix/qt/Makefile.in +++ b/mozilla/webshell/tests/viewer/unix/qt/Makefile.in @@ -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/ +# ***** 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 ***** DEPTH = ../../../../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/webshell/tests/viewer/unix/qt/nsQtMenu.cpp b/mozilla/webshell/tests/viewer/unix/qt/nsQtMenu.cpp index d943ecdc51a..90a23608c78 100644 --- a/mozilla/webshell/tests/viewer/unix/qt/nsQtMenu.cpp +++ b/mozilla/webshell/tests/viewer/unix/qt/nsQtMenu.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,8 +20,8 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Lars Knoll - * Zack Rusin + * Lars Knoll + * Zack Rusin * * 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 @@ -29,11 +29,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/webshell/tests/viewer/unix/qt/nsQtMenu.h b/mozilla/webshell/tests/viewer/unix/qt/nsQtMenu.h index fa052d7e720..235017a3898 100644 --- a/mozilla/webshell/tests/viewer/unix/qt/nsQtMenu.h +++ b/mozilla/webshell/tests/viewer/unix/qt/nsQtMenu.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,8 +20,8 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Lars Knoll - * Zack Rusin + * Lars Knoll + * Zack Rusin * * 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 @@ -29,11 +29,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/nsCursorManager.h b/mozilla/widget/src/cocoa/nsCursorManager.h index 87bb37910ac..648db2ebe79 100644 --- a/mozilla/widget/src/cocoa/nsCursorManager.h +++ b/mozilla/widget/src/cocoa/nsCursorManager.h @@ -1,37 +1,37 @@ /* ***** 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 nsCursors. -* -* The Initial Developer of the Original Code is Andrew Thompson. -* Portions created by the Andrew Thompson are Copyright (C) 2004 -* Andrew Thompson. 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 ***** */ + * 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 nsCursors. + * + * The Initial Developer of the Original Code is Andrew Thompson. + * Portions created by the Andrew Thompson are Copyright (C) 2004 + * Andrew Thompson. 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 ***** */ #import #import "nsIWidget.h" diff --git a/mozilla/widget/src/cocoa/nsCursorManager.mm b/mozilla/widget/src/cocoa/nsCursorManager.mm index ce8fac29943..d7a415c014e 100644 --- a/mozilla/widget/src/cocoa/nsCursorManager.mm +++ b/mozilla/widget/src/cocoa/nsCursorManager.mm @@ -1,37 +1,38 @@ /* ***** 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 nsCursors. -* -* The Initial Developer of the Original Code is Andrew Thompson. -* Portions created by the Andrew Thompson are Copyright (C) 2004 -* Andrew Thompson. 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 ***** */ + * 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 nsCursors. + * + * The Initial Developer of the Original Code is + * Andrew Thompson. + * Portions created by the Andrew Thompson are Copyright (C) 2004 + * Andrew Thompson. 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 ***** */ #import "nsCursorManager.h" #import "math.h" diff --git a/mozilla/widget/src/cocoa/nsMacCursor.mm b/mozilla/widget/src/cocoa/nsMacCursor.mm index 1c36f0db8bd..1208b4fd95e 100644 --- a/mozilla/widget/src/cocoa/nsMacCursor.mm +++ b/mozilla/widget/src/cocoa/nsMacCursor.mm @@ -1,37 +1,38 @@ /* ***** 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 Camino Cursor Code. -* -* The Initial Developer of the Original Code is Andrew Thompson. -* Portions created by the Andrew Thompson are Copyright (C) 2004 -* Andrew Thompson. 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 ***** */ + * 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 Camino Cursor code. + * + * The Initial Developer of the Original Code is + * Andrew Thompson. + * Portions created by the Andrew Thompson are Copyright (C) 2004 + * Andrew Thompson. 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 ***** */ #import "nsMacCursor.h" #import "nsMacResources.h" diff --git a/mozilla/widget/src/cocoa/nsWidgetFactory.mm b/mozilla/widget/src/cocoa/nsWidgetFactory.mm index 0e340530d9c..a23acb8871d 100644 --- a/mozilla/widget/src/cocoa/nsWidgetFactory.mm +++ b/mozilla/widget/src/cocoa/nsWidgetFactory.mm @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; 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,7 +14,7 @@ * * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code is + * 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. @@ -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/gtk2/mozcontainer.c b/mozilla/widget/src/gtk2/mozcontainer.c index 5e1a256cdaa..10786b791cf 100644 --- a/mozilla/widget/src/gtk2/mozcontainer.c +++ b/mozilla/widget/src/gtk2/mozcontainer.c @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/mozcontainer.h b/mozilla/widget/src/gtk2/mozcontainer.h index 8793c207e52..09d84e6fca7 100644 --- a/mozilla/widget/src/gtk2/mozcontainer.h +++ b/mozilla/widget/src/gtk2/mozcontainer.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/mozdrawingarea.c b/mozilla/widget/src/gtk2/mozdrawingarea.c index db534f0e811..a12d91bd869 100644 --- a/mozilla/widget/src/gtk2/mozdrawingarea.c +++ b/mozilla/widget/src/gtk2/mozdrawingarea.c @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/mozdrawingarea.h b/mozilla/widget/src/gtk2/mozdrawingarea.h index 4151ed354ad..817f07154af 100644 --- a/mozilla/widget/src/gtk2/mozdrawingarea.h +++ b/mozilla/widget/src/gtk2/mozdrawingarea.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsAppShell.cpp b/mozilla/widget/src/gtk2/nsAppShell.cpp index e6d5ab99407..935b70730be 100644 --- a/mozilla/widget/src/gtk2/nsAppShell.cpp +++ b/mozilla/widget/src/gtk2/nsAppShell.cpp @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsAppShell.h b/mozilla/widget/src/gtk2/nsAppShell.h index b54be9cbc42..ab46e8b15cf 100644 --- a/mozilla/widget/src/gtk2/nsAppShell.h +++ b/mozilla/widget/src/gtk2/nsAppShell.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp b/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp index a8000bb9cd3..58bdcc1260c 100644 --- a/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/gtk2/nsBidiKeyboard.cpp @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsBidiKeyboard.h b/mozilla/widget/src/gtk2/nsBidiKeyboard.h index c1662549496..7b1b85c4b22 100644 --- a/mozilla/widget/src/gtk2/nsBidiKeyboard.h +++ b/mozilla/widget/src/gtk2/nsBidiKeyboard.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsClipboard.cpp b/mozilla/widget/src/gtk2/nsClipboard.cpp index d0031429fc7..b7fcc5a590e 100644 --- a/mozilla/widget/src/gtk2/nsClipboard.cpp +++ b/mozilla/widget/src/gtk2/nsClipboard.cpp @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsClipboard.h b/mozilla/widget/src/gtk2/nsClipboard.h index eff3b5997c1..f6c8e04ffe8 100644 --- a/mozilla/widget/src/gtk2/nsClipboard.h +++ b/mozilla/widget/src/gtk2/nsClipboard.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsCommonWidget.cpp b/mozilla/widget/src/gtk2/nsCommonWidget.cpp index 5ef5ef4781f..0d6f26f0444 100644 --- a/mozilla/widget/src/gtk2/nsCommonWidget.cpp +++ b/mozilla/widget/src/gtk2/nsCommonWidget.cpp @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsCommonWidget.h b/mozilla/widget/src/gtk2/nsCommonWidget.h index a02121b3edb..87d4848ebe2 100644 --- a/mozilla/widget/src/gtk2/nsCommonWidget.h +++ b/mozilla/widget/src/gtk2/nsCommonWidget.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsGtkKeyUtils.cpp b/mozilla/widget/src/gtk2/nsGtkKeyUtils.cpp index 1f0c944cbc4..20fe0f69f53 100644 --- a/mozilla/widget/src/gtk2/nsGtkKeyUtils.cpp +++ b/mozilla/widget/src/gtk2/nsGtkKeyUtils.cpp @@ -14,11 +14,12 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard - * . Portions created by the Initial Developer - * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. + * The Initial Developer of the Original Code is + * Christopher Blizzard . + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. * * Contributor(s): * diff --git a/mozilla/widget/src/gtk2/nsGtkKeyUtils.h b/mozilla/widget/src/gtk2/nsGtkKeyUtils.h index 036c116bbb8..3eae91fb73d 100644 --- a/mozilla/widget/src/gtk2/nsGtkKeyUtils.h +++ b/mozilla/widget/src/gtk2/nsGtkKeyUtils.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsWidgetFactory.cpp b/mozilla/widget/src/gtk2/nsWidgetFactory.cpp index cddb2e302e9..ccf65b8d204 100644 --- a/mozilla/widget/src/gtk2/nsWidgetFactory.cpp +++ b/mozilla/widget/src/gtk2/nsWidgetFactory.cpp @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsWindow.cpp b/mozilla/widget/src/gtk2/nsWindow.cpp index 45aed5c04bb..f99f2ef5bfb 100644 --- a/mozilla/widget/src/gtk2/nsWindow.cpp +++ b/mozilla/widget/src/gtk2/nsWindow.cpp @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/gtk2/nsWindow.h b/mozilla/widget/src/gtk2/nsWindow.h index 2dfb1290055..ff9a2bbdf72 100644 --- a/mozilla/widget/src/gtk2/nsWindow.h +++ b/mozilla/widget/src/gtk2/nsWindow.h @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/qt/Makefile.in b/mozilla/widget/src/qt/Makefile.in index b2034e4cbf1..61904423d48 100644 --- a/mozilla/widget/src/qt/Makefile.in +++ b/mozilla/widget/src/qt/Makefile.in @@ -1,24 +1,40 @@ # -# 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): -# John C. Griggs +# Contributor(s): +# John C. Griggs # +# 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 ***** DEPTH = ../../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/widget/src/qt/nsBidiKeyboard.cpp b/mozilla/widget/src/qt/nsBidiKeyboard.cpp index 4d2a6626238..44464632ee9 100644 --- a/mozilla/widget/src/qt/nsBidiKeyboard.cpp +++ b/mozilla/widget/src/qt/nsBidiKeyboard.cpp @@ -1,24 +1,41 @@ /* -*- 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/ - * - * 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 IBM code. - * - * The Initial Developer of the Original Code is IBM. - * Portions created by IBM are - * Copyright (C) International Business Machines - * Corporation, 2000. All Rights Reserved. - * - * Contributor(s): Simon Montagu - */ + * + * The Initial Developer of the Original Code is + * IBM. + * Portions created by the Initial Developer are Copyright (C) 2000 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Simon Montagu + * + * 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 "nsBidiKeyboard.h" diff --git a/mozilla/widget/src/qt/nsBidiKeyboard.h b/mozilla/widget/src/qt/nsBidiKeyboard.h index 107f09a4501..82c33882544 100644 --- a/mozilla/widget/src/qt/nsBidiKeyboard.h +++ b/mozilla/widget/src/qt/nsBidiKeyboard.h @@ -1,24 +1,41 @@ /* -*- 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/ - * - * 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 IBM code. - * - * The Initial Developer of the Original Code is IBM. - * Portions created by IBM are - * Copyright (C) International Business Machines - * Corporation, 2000. All Rights Reserved. - * - * Contributor(s): Simon Montagu - */ + * + * The Initial Developer of the Original Code is + * IBM. + * Portions created by the Initial Developer are Copyright (C) 2000 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Simon Montagu + * + * 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 __nsBidiKeyboard #define __nsBidiKeyboard diff --git a/mozilla/widget/src/qt/nsClipboard.cpp b/mozilla/widget/src/qt/nsClipboard.cpp index 3fa80384241..97343b124bf 100644 --- a/mozilla/widget/src/qt/nsClipboard.cpp +++ b/mozilla/widget/src/qt/nsClipboard.cpp @@ -1,10 +1,10 @@ /* ***** 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 @@ -31,11 +31,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/qt/nsClipboard.h b/mozilla/widget/src/qt/nsClipboard.h index 3e4d5842412..416f2c158ed 100644 --- a/mozilla/widget/src/qt/nsClipboard.h +++ b/mozilla/widget/src/qt/nsClipboard.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,7 +20,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Denis Issoupov + * Denis Issoupov * * 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 @@ -28,11 +28,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 ***** */ #ifndef nsClipboard_h__ diff --git a/mozilla/widget/src/qt/nsDragService.cpp b/mozilla/widget/src/qt/nsDragService.cpp index c4e84eada29..e6b9ee4cbe6 100644 --- a/mozilla/widget/src/qt/nsDragService.cpp +++ b/mozilla/widget/src/qt/nsDragService.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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 @@ -32,11 +32,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 ***** */ #ifdef NDEBUG diff --git a/mozilla/widget/src/qt/nsDragService.h b/mozilla/widget/src/qt/nsDragService.h index 2629e7c11e4..632af76a71a 100644 --- a/mozilla/widget/src/qt/nsDragService.h +++ b/mozilla/widget/src/qt/nsDragService.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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 + * 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): - * Denis Issoupov + * Denis Issoupov * * 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 ***** */ #ifndef nsDragService_h__ diff --git a/mozilla/widget/src/qt/nsIDragSessionQt.h b/mozilla/widget/src/qt/nsIDragSessionQt.h index 021f5ef6f80..d2cff20b420 100644 --- a/mozilla/widget/src/qt/nsIDragSessionQt.h +++ b/mozilla/widget/src/qt/nsIDragSessionQt.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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 + * 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): - * Denis Issoupov + * Denis Issoupov * * 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 ***** */ #ifndef nsIDragSessionQt_h__ diff --git a/mozilla/widget/src/qt/nsLookAndFeel.cpp b/mozilla/widget/src/qt/nsLookAndFeel.cpp index 94e52a2e3a6..b8ddc556121 100644 --- a/mozilla/widget/src/qt/nsLookAndFeel.cpp +++ b/mozilla/widget/src/qt/nsLookAndFeel.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,9 +20,9 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Lars Knoll - * Zack Rusin - * John C. Griggs + * Lars Knoll + * Zack Rusin + * John C. Griggs * * 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 @@ -30,11 +30,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 ***** */ #include "nsLookAndFeel.h" diff --git a/mozilla/widget/src/qt/nsLookAndFeel.h b/mozilla/widget/src/qt/nsLookAndFeel.h index e957109393a..e8c7356f545 100644 --- a/mozilla/widget/src/qt/nsLookAndFeel.h +++ b/mozilla/widget/src/qt/nsLookAndFeel.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,8 +20,8 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Lars Knoll - * John C. Griggs + * Lars Knoll + * John C. Griggs * * 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 @@ -29,11 +29,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 ***** */ #ifndef __nsLookAndFeel diff --git a/mozilla/widget/src/qt/nsMime.cpp b/mozilla/widget/src/qt/nsMime.cpp index 79ddf67220e..6b8363bb685 100644 --- a/mozilla/widget/src/qt/nsMime.cpp +++ b/mozilla/widget/src/qt/nsMime.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,9 +20,9 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Lars Knoll - * Zack Rusin - * Denis Issoupov + * Lars Knoll + * Zack Rusin + * Denis Issoupov * * 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 @@ -30,11 +30,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/qt/nsMime.h b/mozilla/widget/src/qt/nsMime.h index 9a7192b53a3..51ad290332e 100644 --- a/mozilla/widget/src/qt/nsMime.h +++ b/mozilla/widget/src/qt/nsMime.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,9 +20,9 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Lars Knoll - * Zack Rusin - * Denis Issoupov + * Lars Knoll + * Zack Rusin + * Denis Issoupov * * 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 @@ -30,11 +30,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 ***** */ #ifndef nsMime_h__ diff --git a/mozilla/widget/src/qt/nsToolkit.cpp b/mozilla/widget/src/qt/nsToolkit.cpp index 4e766dca2ba..86a0610cb4a 100644 --- a/mozilla/widget/src/qt/nsToolkit.cpp +++ b/mozilla/widget/src/qt/nsToolkit.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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,9 +20,9 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): - * Lars Knoll - * Zack Rusin - * John C. Griggs + * Lars Knoll + * Zack Rusin + * John C. Griggs * * 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 @@ -30,11 +30,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/qt/nsToolkit.h b/mozilla/widget/src/qt/nsToolkit.h index 72217c96bdb..8f64cf2ca49 100644 --- a/mozilla/widget/src/qt/nsToolkit.h +++ b/mozilla/widget/src/qt/nsToolkit.h @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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 + * 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): - * John C. Griggs + * John C. Griggs * * 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 ***** */ #ifndef nsToolkit_h__ diff --git a/mozilla/widget/src/qt/nsWidgetFactory.cpp b/mozilla/widget/src/qt/nsWidgetFactory.cpp index d1fc80b6fe5..dba329f81b1 100644 --- a/mozilla/widget/src/qt/nsWidgetFactory.cpp +++ b/mozilla/widget/src/qt/nsWidgetFactory.cpp @@ -1,11 +1,11 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* ***** 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 @@ -15,7 +15,7 @@ * The Original Code is mozilla.org code. * * The Initial Developer of the Original Code is - * John C. Griggs + * John C. Griggs . * Portions created by the Initial Developer are Copyright (C) 2000 * the Initial Developer. All Rights Reserved. * @@ -31,11 +31,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/xremoteclient/XRemoteClientFactory.cpp b/mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp index 62162c28a31..b4df2781cd5 100644 --- a/mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp +++ b/mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp @@ -11,9 +11,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp b/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp index 38deb7b9db2..218c4916abf 100644 --- a/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp +++ b/mozilla/widget/src/xremoteclient/mozilla-xremote-client.cpp @@ -14,9 +14,9 @@ * for the specific language governing rights and limitations under the * License. * - * The Original Code mozilla.org code. + * The Original Code is mozilla.org code. * - * The Initial Developer of the Original Code Christopher Blizzard + * The Initial Developer of the Original Code is Christopher Blizzard * . Portions created by the Initial Developer * are Copyright (C) 2001 the Initial Developer. All Rights Reserved. * diff --git a/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcinvoke_vacpp.asm b/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcinvoke_vacpp.asm index 4d013fdb818..1925b94d7ac 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcinvoke_vacpp.asm +++ b/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcinvoke_vacpp.asm @@ -13,7 +13,7 @@ COMMENT | -*- Mode: asm; tab-width: 8; c-basic-offset: 4 -*- for the specific language governing rights and limitations under the License. - The Original Code is mozilla.org Code. + The Original Code is mozilla.org code. The Initial Developer of the Original Code is Netscape Communications Corporation. diff --git a/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcstubs_vacpp.asm b/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcstubs_vacpp.asm index 3464a1f98ea..21270c904fb 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcstubs_vacpp.asm +++ b/mozilla/xpcom/reflect/xptcall/src/md/os2/xptcstubs_vacpp.asm @@ -13,7 +13,7 @@ COMMENT | -*- Mode: asm; tab-width: 8; c-basic-offset: 4 -*- for the specific language governing rights and limitations under the License. - The Original Code is mozilla.org Code. + The Original Code is mozilla.org code. The Initial Developer of the Original Code is Netscape Communications Corporation. diff --git a/mozilla/xpfe/bootstrap/init.d/moz_patch_checker.dtksh b/mozilla/xpfe/bootstrap/init.d/moz_patch_checker.dtksh index c4355af1ccb..634808ea13c 100644 --- a/mozilla/xpfe/bootstrap/init.d/moz_patch_checker.dtksh +++ b/mozilla/xpfe/bootstrap/init.d/moz_patch_checker.dtksh @@ -15,6 +15,8 @@ # 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 # Roland Mainz # Portions created by the Initial Developer are Copyright (C) 2004 diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm b/mozilla/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm index 5b09b4571b4..ac9e0f61c4b 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportForCocoa.mm @@ -1,10 +1,10 @@ /* ***** 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 @@ -13,7 +13,7 @@ * * The Original Code is Mozilla Communicator client code. * - * The Initial Developer of the Original Code is + * 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. @@ -21,16 +21,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/xpfe/browser/resources/locale/en-US/pageInfo.properties b/mozilla/xpfe/browser/resources/locale/en-US/pageInfo.properties index 49b748df23c..24cb1c523bf 100644 --- a/mozilla/xpfe/browser/resources/locale/en-US/pageInfo.properties +++ b/mozilla/xpfe/browser/resources/locale/en-US/pageInfo.properties @@ -1,24 +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/ - # - # 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 imitations under the License. - # - # The Original Code is mozilla.org code. - # - # The Initial Developer of the Original Code is International - # Business Machines Corporation. Portions created by IBM - # Corporation are Copyright (C) 2000 International Business - # Machines Corporation. All Rights Reserved. - # - # Contributor(s): - # Daniel Brooks - # Mike Kowalski +# +# ***** 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 +# International Business Machines Corporation. +# Portions created by the Initial Developer are Copyright (C) 2000 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Daniel Brooks +# Mike Kowalski +# +# 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 ***** pageInfo.title=Page Info diff --git a/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in b/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in index c041f27fb39..386a1466566 100644 --- a/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in +++ b/mozilla/xpfe/components/filepicker/src/nsFilePicker.js.in @@ -1,6 +1,5 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- - * - * ***** BEGIN LICENSE BLOCK ***** +/* -*- 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 diff --git a/mozilla/xpfe/global/resources/content/fontpackage.js b/mozilla/xpfe/global/resources/content/fontpackage.js index ec28d4d82b6..24b472420db 100644 --- a/mozilla/xpfe/global/resources/content/fontpackage.js +++ b/mozilla/xpfe/global/resources/content/fontpackage.js @@ -1,41 +1,41 @@ /* ***** 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) 2003 -* the Initial Developer. All Rights Reserved. -* -* Contributor(s): -* Frank Yung-Fong Tang -* Simon Montagu -* Seth Spitzer -* -* 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 ***** */ + * 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) 2003 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Frank Yung-Fong Tang + * Simon Montagu + * Seth Spitzer + * + * 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 ***** */ var gLangCode; diff --git a/mozilla/xpfe/global/resources/content/plugins.html b/mozilla/xpfe/global/resources/content/plugins.html index edede1d67dc..3ba988f14a1 100755 --- a/mozilla/xpfe/global/resources/content/plugins.html +++ b/mozilla/xpfe/global/resources/content/plugins.html @@ -1,45 +1,45 @@ + - 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) 1998 + - the Initial Developer. All Rights Reserved. + - + - Contributor(s): + - Mark Olson + - Alexey Chernyak + - Frank Tang + - Mike Connelly + - Robert Kaiser + - + - 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/xpinstall/packager/os2/Makefile.in b/mozilla/xpinstall/packager/os2/Makefile.in index 22e6f6c4ed9..ff5d78c2d50 100644 --- a/mozilla/xpinstall/packager/os2/Makefile.in +++ b/mozilla/xpinstall/packager/os2/Makefile.in @@ -12,8 +12,9 @@ # License. # # The Original Code is mozilla.org packaging code. -# Initial Developer of the Original Code is Benjamin Smedberg -# +# +# The Initial Developer of the Original Code is +# Benjamin Smedberg # Portions created by the Initial Developer are Copyright (C) 2003 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/xpinstall/packager/win_gre/Makefile.in b/mozilla/xpinstall/packager/win_gre/Makefile.in index 93e5ef81f40..363ffacc8c5 100644 --- a/mozilla/xpinstall/packager/win_gre/Makefile.in +++ b/mozilla/xpinstall/packager/win_gre/Makefile.in @@ -12,8 +12,9 @@ # License. # # The Original Code is mozilla.org packaging code. -# Initial Developer of the Original Code is Benjamin Smedberg -# +# +# The Initial Developer of the Original Code is +# Benjamin Smedberg. # Portions created by the Initial Developer are Copyright (C) 2003 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/xpinstall/packager/win_mfcembed/Makefile.in b/mozilla/xpinstall/packager/win_mfcembed/Makefile.in index a34707c85ae..56015344f2d 100644 --- a/mozilla/xpinstall/packager/win_mfcembed/Makefile.in +++ b/mozilla/xpinstall/packager/win_mfcembed/Makefile.in @@ -12,8 +12,9 @@ # License. # # The Original Code is mozilla.org packaging code. -# Initial Developer of the Original Code is Benjamin Smedberg -# +# +# The Initial Developer of the Original Code is +# Benjamin Smedberg. # Portions created by the Initial Developer are Copyright (C) 2003 # the Initial Developer. All Rights Reserved. # diff --git a/mozilla/xulrunner/app/mozilla.in b/mozilla/xulrunner/app/mozilla.in index edfe7fad6f0..e8e5ce543ab 100755 --- a/mozilla/xulrunner/app/mozilla.in +++ b/mozilla/xulrunner/app/mozilla.in @@ -1,22 +1,42 @@ #!/bin/sh # -# 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/ +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 # -# Software distributed under the NPL is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the 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 -# NPL. +# License. # -# The Initial Developer of this code under the NPL is Netscape -# Communications Corporation. Portions created by Netscape are -# Copyright (C) 1998 Netscape Communications Corporation. All Rights -# Reserved. +# 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) 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 ***** -## $Id: mozilla.in,v 1.1 2004-08-05 21:38:22 darin%meer.net Exp $ +## $Id: mozilla.in,v 1.2 2004-12-01 22:27:02 gerv%gerv.net Exp $ ## ## Usage: ## diff --git a/mozilla/xulrunner/app/profile/Makefile.in b/mozilla/xulrunner/app/profile/Makefile.in index 2ce4fffda6e..9d6ede6865a 100644 --- a/mozilla/xulrunner/app/profile/Makefile.in +++ b/mozilla/xulrunner/app/profile/Makefile.in @@ -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/ +# ***** 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 ***** DEPTH = ../../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/xulrunner/app/profile/chrome/Makefile.in b/mozilla/xulrunner/app/profile/chrome/Makefile.in index 99534a864f8..df06bb4d5f3 100644 --- a/mozilla/xulrunner/app/profile/chrome/Makefile.in +++ b/mozilla/xulrunner/app/profile/chrome/Makefile.in @@ -1,18 +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/ +# ***** 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. # -# Contributor(s): +# The Initial Developer of the Original Code is +# a mozilla.org contributor. +# Portions created by the Initial Developer are Copyright (C) 2004 +# 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 ***** DEPTH = ../../../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/xulrunner/app/profile/extensions/Makefile.in b/mozilla/xulrunner/app/profile/extensions/Makefile.in index 73f1827463b..e1cd75f23ea 100644 --- a/mozilla/xulrunner/app/profile/extensions/Makefile.in +++ b/mozilla/xulrunner/app/profile/extensions/Makefile.in @@ -1,18 +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/ +# ***** 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. # -# Contributor(s): +# The Initial Developer of the Original Code is +# a mozilla.org contributor. +# Portions created by the Initial Developer are Copyright (C) 2004 +# 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 ***** DEPTH = ../../../.. topsrcdir = @top_srcdir@ diff --git a/mozilla/xulrunner/app/splash.rc b/mozilla/xulrunner/app/splash.rc index ec21970d809..cd2eb07187f 100644 --- a/mozilla/xulrunner/app/splash.rc +++ b/mozilla/xulrunner/app/splash.rc @@ -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,7 +14,7 @@ * * The Original Code is Mozilla Communicator client code. * - * The Initial Developer of the Original Code is + * 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. @@ -24,16 +24,16 @@ * Jonathan Wilson * * 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 ***** */ #include diff --git a/mozilla/xulrunner/app/splashos2.rc b/mozilla/xulrunner/app/splashos2.rc index cd82e3ccc70..0e36aa5d529 100644 --- a/mozilla/xulrunner/app/splashos2.rc +++ b/mozilla/xulrunner/app/splashos2.rc @@ -1,26 +1,42 @@ /* -*- 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 Communicator client 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): * Bill Law law@netscape.com * IBM Corp. - */ + * + * 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 // Splash screen dialog ID.