summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-06 21:15:10 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-12-06 21:24:37 +0000
commitc8ef924060b1f5d5e26b62645d9c0f24f7ce662b (patch)
tree6bef65f15e74fb3c63a778c69d23f8b4af152e23
parent485138f3a574417bb25af1f478d990599566f84d (diff)
normalize Red Hat, Inc. spellings, and bump to latest template
-rw-r--r--automation/AllLangResTarget_tma.mk4
-rw-r--r--automation/Executable_miniapp.mk4
-rw-r--r--automation/Executable_testtool.mk4
-rw-r--r--automation/Library_communi.mk4
-rw-r--r--automation/Library_simplecm.mk4
-rw-r--r--automation/Library_sts.mk4
-rw-r--r--automation/Module_automation.mk4
-rw-r--r--automation/Package_hid.mk4
-rw-r--r--automation/Package_inc.mk4
-rw-r--r--automation/Package_packimages.mk4
-rw-r--r--automation/Package_testtool.mk4
-rw-r--r--automation/inc/automation/communidllapi.h3
-rw-r--r--automation/inc/automation/simplecmdllapi.h3
-rw-r--r--automation/inc/automation/stsdllapi.h3
-rw-r--r--automation/packimages/Makefile4
-rw-r--r--automation/source/testtool/Makefile5
-rwxr-xr-xbin/get-bugzilla-attachments-by-mimetype12
-rw-r--r--chart2/AllLangResTarget_chartcontroller.mk9
-rw-r--r--chart2/Library_chartcontroller.mk9
-rw-r--r--chart2/Library_chartmodel.mk9
-rw-r--r--chart2/Library_charttools.mk9
-rw-r--r--chart2/Library_chartview.mk9
-rw-r--r--chart2/Package_uiconfig.mk9
-rw-r--r--comphelper/CppunitTest_comphelper_test.mk11
-rw-r--r--comphelper/inc/comphelper/scoped_disposing_ptr.hxx16
-rw-r--r--comphelper/inc/comphelper/xmltools.hxx16
-rw-r--r--comphelper/source/xml/xmltools.cxx16
-rw-r--r--cui/AllLangResTarget_cui.mk9
-rw-r--r--cui/Library_cui.mk9
-rw-r--r--cui/Module_cui.mk9
-rw-r--r--dbaccess/AllLangResTarget_adabasui.mk9
-rw-r--r--dbaccess/AllLangResTarget_dba.mk9
-rw-r--r--dbaccess/AllLangResTarget_dbmm.mk9
-rw-r--r--dbaccess/AllLangResTarget_dbu.mk9
-rw-r--r--dbaccess/AllLangResTarget_sdbt.mk9
-rw-r--r--dbaccess/Executable_odbcconfig.mk9
-rw-r--r--dbaccess/Library_adabasui.mk9
-rw-r--r--dbaccess/Library_dba.mk9
-rw-r--r--dbaccess/Library_dbaxml.mk9
-rw-r--r--dbaccess/Library_dbmm.mk9
-rw-r--r--dbaccess/Library_dbu.mk9
-rw-r--r--dbaccess/Library_sdbt.mk9
-rw-r--r--dbaccess/Package_inc.mk9
-rw-r--r--dbaccess/Package_uiconfig.mk9
-rw-r--r--desktop/AllLangResTarget_deployment.mk4
-rw-r--r--desktop/AllLangResTarget_deploymentgui.mk4
-rw-r--r--desktop/AllLangResTarget_dkt.mk4
-rw-r--r--desktop/Executable_crashrep.com.mk4
-rw-r--r--desktop/Executable_officeloader.mk4
-rw-r--r--desktop/Executable_oosplash.mk4
-rw-r--r--desktop/Executable_quickstart.mk4
-rw-r--r--desktop/Executable_sbase.mk4
-rw-r--r--desktop/Executable_scalc.mk4
-rw-r--r--desktop/Executable_sdraw.mk4
-rw-r--r--desktop/Executable_simpress.mk4
-rw-r--r--desktop/Executable_smath.mk4
-rw-r--r--desktop/Executable_soffice.bin.mk4
-rw-r--r--desktop/Executable_soffice.mk4
-rw-r--r--desktop/Executable_sweb.mk4
-rw-r--r--desktop/Executable_swriter.mk4
-rw-r--r--desktop/Executable_unoinfo.mk4
-rw-r--r--desktop/Executable_unopkg.bin.mk4
-rw-r--r--desktop/Executable_unopkg.com.mk4
-rw-r--r--desktop/Executable_unopkg.mk4
-rw-r--r--desktop/Library_deployment.mk4
-rw-r--r--desktop/Library_deploymentgui.mk4
-rw-r--r--desktop/Library_deploymentmisc.mk4
-rw-r--r--desktop/Library_migrationoo2.mk4
-rw-r--r--desktop/Library_migrationoo3.mk4
-rw-r--r--desktop/Library_offacc.mk4
-rw-r--r--desktop/Library_sofficeapp.mk4
-rw-r--r--desktop/Library_spl.mk4
-rw-r--r--desktop/Library_spl_unx.mk4
-rw-r--r--desktop/Library_unopkgapp.mk4
-rw-r--r--desktop/Module_desktop.mk4
-rw-r--r--desktop/Package_branding.mk4
-rw-r--r--desktop/Package_intro.mk4
-rw-r--r--desktop/Package_scripts.mk4
-rw-r--r--desktop/Pagein.mk4
-rw-r--r--desktop/Pagein_calc.mk4
-rw-r--r--desktop/Pagein_common.mk4
-rw-r--r--desktop/Pagein_draw.mk4
-rw-r--r--desktop/Pagein_impress.mk4
-rw-r--r--desktop/Pagein_writer.mk4
-rw-r--r--desktop/WinResTarget_quickstart.mk4
-rw-r--r--desktop/WinResTarget_sbase.mk4
-rw-r--r--desktop/WinResTarget_scalc.mk4
-rw-r--r--desktop/WinResTarget_sdraw.mk4
-rw-r--r--desktop/WinResTarget_simpress.mk4
-rw-r--r--desktop/WinResTarget_smath.mk4
-rw-r--r--desktop/WinResTarget_soffice.mk4
-rw-r--r--desktop/WinResTarget_sweb.mk4
-rw-r--r--desktop/WinResTarget_swriter.mk4
-rw-r--r--desktop/Zip_brand.mk4
-rw-r--r--desktop/Zip_brand_dev.mk4
-rw-r--r--desktop/Zip_shell.mk4
-rw-r--r--desktop/branding/Makefile4
-rw-r--r--desktop/source/inc/desktopdllapi.h4
-rw-r--r--drawinglayer/Library_drawinglayer.mk9
-rw-r--r--drawinglayer/Module_drawinglayer.mk9
-rw-r--r--drawinglayer/Package_inc.mk9
-rw-r--r--drawinglayer/inc/drawinglayer/drawinglayerdllapi.h9
-rw-r--r--extensions/Module_extensions.mk1
-rw-r--r--fileaccess/Library_fileacc.mk10
-rw-r--r--fileaccess/Module_fileaccess.mk10
-rw-r--r--forms/AllLangResTarget_frm.mk9
-rw-r--r--forms/Library_frm.mk9
-rw-r--r--forms/Package_unotypes.mk9
-rw-r--r--formula/AllLangResTarget_for.mk9
-rw-r--r--formula/AllLangResTarget_forui.mk9
-rw-r--r--formula/Library_for.mk9
-rw-r--r--formula/Library_forui.mk9
-rw-r--r--formula/Module_formula.mk9
-rw-r--r--formula/Package_inc.mk9
-rw-r--r--hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk2
-rw-r--r--hwpfilter/Library_hwp.mk9
-rw-r--r--hwpfilter/Module_hwpfilter.mk11
-rw-r--r--hwpfilter/qa/cppunit/test_hwpfilter.cxx15
-rw-r--r--lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk2
-rw-r--r--lotuswordpro/Library_lwpft.mk9
-rw-r--r--lotuswordpro/Module_lotuswordpro.mk11
-rw-r--r--lotuswordpro/qa/cppunit/test_lotuswordpro.cxx15
-rw-r--r--lotuswordpro/source/filter/clone.hxx15
-rw-r--r--lotuswordpro/source/filter/lwpbackgroundoverride.cxx15
-rw-r--r--lotuswordpro/source/filter/lwptaboverride.cxx15
-rw-r--r--offapi/com/sun/star/configuration/theDefaultProvider.idl5
-rw-r--r--offapi/com/sun/star/i18n/Calendar2.idl3
-rw-r--r--offapi/com/sun/star/i18n/CalendarItem2.idl3
-rw-r--r--offapi/com/sun/star/i18n/XCalendar3.idl3
-rw-r--r--offapi/com/sun/star/i18n/XLocaleData3.idl3
-rw-r--r--oox/Library_oox.mk9
-rw-r--r--oox/Module_oox.mk11
-rw-r--r--oox/Package_generated.mk9
-rw-r--r--oox/Package_inc.mk9
-rw-r--r--oox/Package_tokens.mk9
-rw-r--r--reportdesign/AllLangResTarget_rpt.mk9
-rw-r--r--reportdesign/Library_rpt.mk9
-rw-r--r--reportdesign/Library_rptui.mk9
-rw-r--r--reportdesign/Library_rptxml.mk9
-rw-r--r--reportdesign/Module_reportdesign.mk9
-rw-r--r--reportdesign/Package_uiconfig.mk9
-rw-r--r--sal/inc/internal/rtllifecycle.h4
-rw-r--r--sal/inc/sal/detail/log.h4
-rw-r--r--sal/inc/sal/log.hxx4
-rw-r--r--sal/osl/all/log.cxx4
-rw-r--r--sal/osl/all/logformat.hxx4
-rw-r--r--sal/osl/all/trace.cxx4
-rw-r--r--sal/osl/unx/createfilehandlefromfd.hxx4
-rw-r--r--sal/qa/cppunit_local.mk16
-rw-r--r--sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx4
-rw-r--r--sal/util/sal_textenc/makefile.mk2
-rw-r--r--sal/util/sal_textenc/saltextenc.map4
-rw-r--r--sal/workben/measure_oustrings.cxx14
-rw-r--r--salhelper/inc/salhelper/linkhelper.hxx16
-rw-r--r--sc/CppunitTest_sc_filters_test.mk11
-rw-r--r--sc/CppunitTest_sc_macros_test.mk11
-rw-r--r--sc/CppunitTest_sc_subsequent_filters_test.mk11
-rw-r--r--scp2/source/smoketest/makefile.mk2
-rw-r--r--sd/AllLangResTarget_sd.mk9
-rw-r--r--sd/CppunitTest_sd_filters_test.mk9
-rw-r--r--sd/CppunitTest_sd_uimpress.mk9
-rw-r--r--sd/Library_sd.mk9
-rw-r--r--sd/Library_sdd.mk9
-rw-r--r--sd/Library_sdfilt.mk9
-rw-r--r--sd/Library_sdui.mk9
-rw-r--r--sd/Package_inc.mk9
-rw-r--r--sd/Package_uiconfig.mk9
-rw-r--r--sd/Package_web.mk9
-rw-r--r--sd/Package_xml.mk9
-rw-r--r--slideshow/CppunitTest_slideshow.mk9
-rw-r--r--slideshow/Executable_demoshow.mk9
-rw-r--r--slideshow/Library_OGLTrans.mk9
-rw-r--r--slideshow/Library_slideshow.mk9
-rw-r--r--slideshow/Module_slideshow.mk9
-rwxr-xr-xsolenv/bin/install-gdb-printers9
-rw-r--r--solenv/gbuild/ComponentsTarget.mk9
-rw-r--r--solenv/gbuild/Pyuno.mk4
-rw-r--r--solenv/gbuild/RdbTarget.mk9
-rw-r--r--solenv/gbuild/platform/ANDROID_ARM_GCC.mk19
-rw-r--r--solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk19
-rw-r--r--solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk19
-rw-r--r--solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk19
-rw-r--r--solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_ARM_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_AXP_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_GODSON_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_HPPA_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_IA64_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_INTEL_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_M68K_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_POWERPC_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_S390X_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_S390_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_SPARC_GCC.mk19
-rw-r--r--solenv/gbuild/platform/LINUX_X86_64_GCC.mk19
-rw-r--r--solenv/gbuild/platform/NETBSD_INTEL_GCC.mk19
-rw-r--r--solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk19
-rw-r--r--solenv/gbuild/platform/NETBSD_SPARC_GCC.mk19
-rw-r--r--solenv/gbuild/platform/NETBSD_X86_64_GCC.mk19
-rw-r--r--solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk19
-rw-r--r--solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk19
-rw-r--r--solenv/gbuild/platform/linux.mk19
-rw-r--r--solenv/gdb/autoload.template10
-rw-r--r--solenv/gdb/libreoffice/__init__.py11
-rw-r--r--solenv/gdb/libreoffice/cppu.py10
-rw-r--r--solenv/gdb/libreoffice/sal.py10
-rw-r--r--solenv/gdb/libreoffice/svl.py10
-rw-r--r--solenv/gdb/libreoffice/sw.py10
-rw-r--r--solenv/gdb/libreoffice/tl.py10
-rw-r--r--solenv/gdb/libreoffice/util/__init__.py11
-rw-r--r--solenv/gdb/libreoffice/util/compatibility.py10
-rw-r--r--solenv/gdb/libreoffice/util/printing.py10
-rw-r--r--solenv/gdb/libreoffice/util/string.py10
-rw-r--r--solenv/gdb/libreoffice/util/uno.py10
-rw-r--r--solenv/gdb/makefile.mk10
-rw-r--r--sot/qa/cppunit/test_sot.cxx15
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk9
-rw-r--r--starmath/qa/cppunit/test_starmath.cxx16
-rw-r--r--svtools/CppunitTest_svtools_filters_test.mk11
-rw-r--r--sw/CppunitTest_sw_filters_test.mk9
-rw-r--r--sw/CppunitTest_sw_macros_test.mk9
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk9
-rw-r--r--sw/source/ui/app/swdllimpl.hxx16
-rw-r--r--sw/source/ui/inc/titlepage.hxx16
-rw-r--r--sw/source/ui/misc/titlepage.cxx15
-rw-r--r--sw/source/ui/misc/titlepage.hrc17
-rw-r--r--sw/source/ui/misc/titlepage.src16
-rw-r--r--ucb/source/ucp/webdav/warnings_guard_ne_locks.h3
-rw-r--r--unodevtools/source/skeletonmaker/ostringostreaminserter.hxx2
-rw-r--r--unotools/Library_utl.mk9
-rw-r--r--unotools/Package_inc.mk9
-rw-r--r--vcl/Package_kde4moc.mk15
-rw-r--r--vcl/inc/unx/gtk/gtkprn.hxx6
-rw-r--r--vcl/inc/vcl/fontcapabilities.hxx16
-rw-r--r--vcl/unx/gtk/gdi/gtkprintwrapper.cxx3
-rw-r--r--vcl/unx/gtk/gdi/salprn-gtk.cxx5
-rw-r--r--vcl/unx/gtk/inc/gtkprintwrapper.hxx3
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkaction.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkbridge.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkfactory.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkimage.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atklistener.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkregistry.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkselection.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atktable.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atktext.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkutil.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkvalue.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkwindow.cxx15
-rw-r--r--vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx15
-rw-r--r--vcl/unx/gtk3/app/gtk3gtkdata.cxx15
-rw-r--r--vcl/unx/gtk3/app/gtk3gtkinst.cxx15
-rw-r--r--vcl/unx/gtk3/app/gtk3gtksys.cxx15
-rw-r--r--vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx3
-rw-r--r--vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx15
-rw-r--r--vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx3
-rw-r--r--vcl/unx/gtk3/inc/gtkprintwrapper.hxx3
-rw-r--r--vcl/unx/gtk3/window/gtk3gtkframe.cxx15
-rw-r--r--vcl/unx/gtk3/window/gtk3gtkobject.cxx15
-rw-r--r--vcl/unx/kde4/Makefile16
-rw-r--r--vcl/unx/kde4/warning_guard_qhash.h4
-rw-r--r--wizards/Pyuno_commonwizards.mk4
-rw-r--r--wizards/Pyuno_fax.mk4
-rw-r--r--writerfilter/Library_doctok.mk9
-rw-r--r--writerfilter/Library_ooxml.mk9
-rw-r--r--writerfilter/Library_resourcemodel.mk9
-rw-r--r--writerfilter/Library_rtftok.mk9
-rw-r--r--writerfilter/Library_writerfilter.mk9
-rw-r--r--writerfilter/Library_writerfilter_uno.mk9
-rw-r--r--writerfilter/Module_writerfilter.mk9
275 files changed, 1268 insertions, 1238 deletions
diff --git a/automation/AllLangResTarget_tma.mk b/automation/AllLangResTarget_tma.mk
index 6cb59f32eab2..5181caed97ff 100644
--- a/automation/AllLangResTarget_tma.mk
+++ b/automation/AllLangResTarget_tma.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk
index bb0e2b788fef..3c4d8566996c 100644
--- a/automation/Executable_miniapp.mk
+++ b/automation/Executable_miniapp.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Executable_testtool.mk b/automation/Executable_testtool.mk
index 0aa986e3abb5..37a83762ba99 100644
--- a/automation/Executable_testtool.mk
+++ b/automation/Executable_testtool.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Library_communi.mk b/automation/Library_communi.mk
index 0692db12b768..a3b9534a21fc 100644
--- a/automation/Library_communi.mk
+++ b/automation/Library_communi.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Library_simplecm.mk b/automation/Library_simplecm.mk
index 3ac6c3761241..9f85934077b4 100644
--- a/automation/Library_simplecm.mk
+++ b/automation/Library_simplecm.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk
index 80e7b7b8e6cd..b680ea541c50 100644
--- a/automation/Library_sts.mk
+++ b/automation/Library_sts.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Module_automation.mk b/automation/Module_automation.mk
index 5a30f9bfc44d..019a410e7a64 100644
--- a/automation/Module_automation.mk
+++ b/automation/Module_automation.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Package_hid.mk b/automation/Package_hid.mk
index fff48d19bab3..e9e4d7baf77a 100644
--- a/automation/Package_hid.mk
+++ b/automation/Package_hid.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Package_inc.mk b/automation/Package_inc.mk
index cf02c1148ed1..835dc96f56a8 100644
--- a/automation/Package_inc.mk
+++ b/automation/Package_inc.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Package_packimages.mk b/automation/Package_packimages.mk
index 1299cb84c035..a8188105132e 100644
--- a/automation/Package_packimages.mk
+++ b/automation/Package_packimages.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/Package_testtool.mk b/automation/Package_testtool.mk
index ea887540f8b3..e85ee1ba8bc1 100644
--- a/automation/Package_testtool.mk
+++ b/automation/Package_testtool.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/inc/automation/communidllapi.h b/automation/inc/automation/communidllapi.h
index 637d00d88900..7bec94a4ebbf 100644
--- a/automation/inc/automation/communidllapi.h
+++ b/automation/inc/automation/communidllapi.h
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/automation/inc/automation/simplecmdllapi.h b/automation/inc/automation/simplecmdllapi.h
index 08c262ac2c97..2963ebb5c049 100644
--- a/automation/inc/automation/simplecmdllapi.h
+++ b/automation/inc/automation/simplecmdllapi.h
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/automation/inc/automation/stsdllapi.h b/automation/inc/automation/stsdllapi.h
index e7c3c64942de..56f4e483aec7 100644
--- a/automation/inc/automation/stsdllapi.h
+++ b/automation/inc/automation/stsdllapi.h
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/automation/packimages/Makefile b/automation/packimages/Makefile
index a26f11793bee..481d5269c7a9 100644
--- a/automation/packimages/Makefile
+++ b/automation/packimages/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/automation/source/testtool/Makefile b/automation/source/testtool/Makefile
index 9b1e0071311f..c07c6c8cf22e 100644
--- a/automation/source/testtool/Makefile
+++ b/automation/source/testtool/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
@@ -23,7 +25,6 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-
gb_PARTIALBUILD:=T
include $(GBUILDDIR)/gbuild_simple.mk
diff --git a/bin/get-bugzilla-attachments-by-mimetype b/bin/get-bugzilla-attachments-by-mimetype
index 72157649b100..420f6a095e74 100755
--- a/bin/get-bugzilla-attachments-by-mimetype
+++ b/bin/get-bugzilla-attachments-by-mimetype
@@ -1,6 +1,4 @@
#!/usr/bin/env python
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -13,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -27,7 +24,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
#This digs through a pile of bugzilla's and populates the cwd with a big
#collection of bug-docs in per-filetype dirs with bug-ids as names with
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 600196c4c769..c1ca22025ef3 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index f34174fa135d..fbfbcb7a8b96 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index d5e6f530e9eb..9781e9b7ac8e 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 2405fb33ac6e..b67f90832797 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index ea347746e5c6..de52de2ff885 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/chart2/Package_uiconfig.mk b/chart2/Package_uiconfig.mk
index d9787084e33f..12806dff743d 100644
--- a/chart2/Package_uiconfig.mk
+++ b/chart2/Package_uiconfig.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk
index f35f553edb06..8797a8ba949d 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -1,5 +1,4 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -12,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -26,7 +24,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,comphelper_test))
diff --git a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
index 7278126c2633..9b4fe1bc6922 100644
--- a/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
+++ b/comphelper/inc/comphelper/scoped_disposing_ptr.hxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#ifndef _SCOPED_DISPOSING_PTR
#define _SCOPED_DISPOSING_PTR
diff --git a/comphelper/inc/comphelper/xmltools.hxx b/comphelper/inc/comphelper/xmltools.hxx
index c18cc69123bc..c333ecf6acf3 100644
--- a/comphelper/inc/comphelper/xmltools.hxx
+++ b/comphelper/inc/comphelper/xmltools.hxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#ifndef _XMLCHAFF_HXX
#define _XMLCHAFF_HXX
diff --git a/comphelper/source/xml/xmltools.cxx b/comphelper/source/xml/xmltools.cxx
index c5a5a724d77a..1f5f2c3c20d1 100644
--- a/comphelper/source/xml/xmltools.cxx
+++ b/comphelper/source/xml/xmltools.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#include <comphelper/xmltools.hxx>
#include <rtl/random.h>
#include <boost/static_assert.hpp>
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 5784412b7d29..bbe5492a507b 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index b9bea3362953..fa6df22e1bac 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 8b7117bdc062..7a06b1efb44f 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
index cc7325ff0c04..d3203e2edfa6 100644
--- a/dbaccess/AllLangResTarget_adabasui.mk
+++ b/dbaccess/AllLangResTarget_adabasui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
index 092dfc7ba306..8dc4bebde605 100644
--- a/dbaccess/AllLangResTarget_dba.mk
+++ b/dbaccess/AllLangResTarget_dba.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
index 2eb73d5da0d5..dcb6aa17d270 100644
--- a/dbaccess/AllLangResTarget_dbmm.mk
+++ b/dbaccess/AllLangResTarget_dbmm.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 73cb4095f614..15b6806005c6 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
index 3cd41326cf2a..dd38e994756e 100644
--- a/dbaccess/AllLangResTarget_sdbt.mk
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 6910ffd38849..4def9b330620 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index d9c714be152c..2f5546610cde 100644
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index c8ac7c898e32..4a93a973d7b0 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index a0fb88e091ec..c7535a9496f1 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 4c997517048d..f635bbc4a445 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index c537d2d7baab..b0deeea3ecbd 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 165f3983bbd7..23d5f5b820f4 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk
index 9dd8fc819112..de3c3cff2641 100644
--- a/dbaccess/Package_inc.mk
+++ b/dbaccess/Package_inc.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/dbaccess/Package_uiconfig.mk b/dbaccess/Package_uiconfig.mk
index f66af974a02a..cf06bb11727f 100644
--- a/dbaccess/Package_uiconfig.mk
+++ b/dbaccess/Package_uiconfig.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/desktop/AllLangResTarget_deployment.mk b/desktop/AllLangResTarget_deployment.mk
index 1ccd45eb5b94..3bdf867bd467 100644
--- a/desktop/AllLangResTarget_deployment.mk
+++ b/desktop/AllLangResTarget_deployment.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk
index 997ee4281f1a..d9e82cc4937f 100644
--- a/desktop/AllLangResTarget_deploymentgui.mk
+++ b/desktop/AllLangResTarget_deploymentgui.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk
index 3e3cb1815508..5dd7f044f5c4 100644
--- a/desktop/AllLangResTarget_dkt.mk
+++ b/desktop/AllLangResTarget_dkt.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 104880aeb31a..1db348367ef7 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index 956d3d642786..d48518a6fe03 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 1706f3a67173..d18cfcc94a61 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index e762f19da379..470497d07e39 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 979702a9fd54..1d6ff3839d39 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index c30914cc1120..47dc397885d7 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index f2a27d201d54..87de0eb93f1d 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 34d8f0a65548..d698df259c30 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index defd4f291e62..a7b69e570a2a 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index cc5796ad0059..e5d5e180c81a 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index ac6e7081764d..115ecb777a93 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index f2753dca5c14..3a87a313c4c7 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index 02aa213f3ca1..04624d652bfc 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index 90074f392e16..bdb634239530 100644
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 68687d1fb2e4..759a4e90147b 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index c7c3809e1b33..9eb961b74502 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index b5ef6a7c135a..9e4a49025084 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 0c4861116342..91561c8488e7 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 02f4a232fc43..28b9b4a63593 100644
--- a/desktop/Library_deploymentgui.mk
+++ b/desktop/Library_deploymentgui.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 5d1e9ff05810..fc1a175d5e55 100644
--- a/desktop/Library_deploymentmisc.mk
+++ b/desktop/Library_deploymentmisc.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 7ec41e8a6664..6bdf9268d213 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 30277d052b5b..a50067726dd6 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index f79f50b7ba4e..c60db2574c77 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index abc63bfab679..3db7a47f8dcf 100644
--- a/desktop/Library_sofficeapp.mk
+++ b/desktop/Library_sofficeapp.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index cf170ce43ec5..da9dc4853666 100644
--- a/desktop/Library_spl.mk
+++ b/desktop/Library_spl.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
index e6b3aabef345..e549a3eb67fe 100644
--- a/desktop/Library_spl_unx.mk
+++ b/desktop/Library_spl_unx.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 3f78924ffaa4..f2233ec8726f 100644
--- a/desktop/Library_unopkgapp.mk
+++ b/desktop/Library_unopkgapp.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 5c1d523b8c01..8439d3860381 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index 9e00e2310702..bd2f36f8183c 100644
--- a/desktop/Package_branding.mk
+++ b/desktop/Package_branding.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Package_intro.mk b/desktop/Package_intro.mk
index b54c90bf4398..7ffa9095c119 100644
--- a/desktop/Package_intro.mk
+++ b/desktop/Package_intro.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index e0e7d35921a0..d2afeda78959 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Pagein.mk b/desktop/Pagein.mk
index 616b9cc1c706..d1b370ccec83 100644
--- a/desktop/Pagein.mk
+++ b/desktop/Pagein.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Pagein_calc.mk b/desktop/Pagein_calc.mk
index 64c2bf9f21bd..a14668d38816 100644
--- a/desktop/Pagein_calc.mk
+++ b/desktop/Pagein_calc.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 3b0330c396df..85a7d184c4fd 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Pagein_draw.mk b/desktop/Pagein_draw.mk
index d3cc26a67a3b..1808db444bfe 100644
--- a/desktop/Pagein_draw.mk
+++ b/desktop/Pagein_draw.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Pagein_impress.mk b/desktop/Pagein_impress.mk
index 96043f21cb12..4d286e1dcb98 100644
--- a/desktop/Pagein_impress.mk
+++ b/desktop/Pagein_impress.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Pagein_writer.mk b/desktop/Pagein_writer.mk
index ccd24674bde5..935cb2de91b0 100644
--- a/desktop/Pagein_writer.mk
+++ b/desktop/Pagein_writer.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk
index 57e635835aa9..04dffbfe0e3a 100644
--- a/desktop/WinResTarget_quickstart.mk
+++ b/desktop/WinResTarget_quickstart.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index fe519bfc1b8e..8472601397bc 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/desktop/WinResTarget_sbase.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index bd710ea031ed..8470b2d23b78 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/desktop/WinResTarget_scalc.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index b96a420af31e..e208b320558b 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/desktop/WinResTarget_sdraw.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index a0a5a38f3dbb..7d4778f5d9cc 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/desktop/WinResTarget_simpress.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index ac6ae36475b6..f00da3a91663 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/desktop/WinResTarget_smath.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index 5441a2864157..aa404c3c2239 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/desktop/WinResTarget_soffice.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 424390fddc24..0c5cafdee0d4 100644
--- a/desktop/WinResTarget_sweb.mk
+++ b/desktop/WinResTarget_sweb.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index 71e518413f3c..59561f69f7f5 100644
--- a/desktop/WinResTarget_swriter.mk
+++ b/desktop/WinResTarget_swriter.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
index 4e89c778dfa2..03ba5ece57d9 100644
--- a/desktop/Zip_brand.mk
+++ b/desktop/Zip_brand.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk
index 9a7a9ead3b07..4ab19318f1b2 100644
--- a/desktop/Zip_brand_dev.mk
+++ b/desktop/Zip_brand_dev.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/Zip_shell.mk b/desktop/Zip_shell.mk
index df11bb1b8da9..08c6b811b8ba 100644
--- a/desktop/Zip_shell.mk
+++ b/desktop/Zip_shell.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/branding/Makefile b/desktop/branding/Makefile
index cdd37ab77821..7b062a346875 100644
--- a/desktop/branding/Makefile
+++ b/desktop/branding/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/desktop/source/inc/desktopdllapi.h b/desktop/source/inc/desktopdllapi.h
index a97f4d429a04..dcb8dbc858e1 100644
--- a/desktop/source/inc/desktopdllapi.h
+++ b/desktop/source/inc/desktopdllapi.h
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -12,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 1e3b73873ba9..7b884141a68b 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/drawinglayer/Module_drawinglayer.mk b/drawinglayer/Module_drawinglayer.mk
index 95f6cc26096d..0e8d8f0b6f4c 100644
--- a/drawinglayer/Module_drawinglayer.mk
+++ b/drawinglayer/Module_drawinglayer.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/drawinglayer/Package_inc.mk b/drawinglayer/Package_inc.mk
index 4066f6dcc8ab..246a91f309cd 100644
--- a/drawinglayer/Package_inc.mk
+++ b/drawinglayer/Package_inc.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
index 8badcbe1fe82..d25f74d5036a 100644
--- a/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
+++ b/drawinglayer/inc/drawinglayer/drawinglayerdllapi.h
@@ -12,12 +12,11 @@
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * David Tardon, Red Hat Inc. <dtardon@redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
- *
* Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
+ *
+ * All Rights Reserved.
*
* For minor contributions see the git repository.
*
diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 673274817a64..cf44b2d8a7db 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index 664cf2c15620..1ea8b340ddfc 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -11,13 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Red Hat, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
-# Major Contributor(s):
-# David Tardon <dtardon@redhat.com>
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/fileaccess/Module_fileaccess.mk b/fileaccess/Module_fileaccess.mk
index 8514f090347a..3b4c285e71b1 100644
--- a/fileaccess/Module_fileaccess.mk
+++ b/fileaccess/Module_fileaccess.mk
@@ -11,13 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Red Hat, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
-# Major Contributor(s):
-# David Tardon <dtardon@redhat.com>
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
index d8a232def240..12849a3d9903 100644
--- a/forms/AllLangResTarget_frm.mk
+++ b/forms/AllLangResTarget_frm.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 92bcad8f3c1d..226d00203343 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/forms/Package_unotypes.mk b/forms/Package_unotypes.mk
index baff97f6ba46..6c4ff897346b 100644
--- a/forms/Package_unotypes.mk
+++ b/forms/Package_unotypes.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index 3eb792f8f15b..08306236645b 100644
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk
index a099191b1efe..71d3e130e902 100644
--- a/formula/AllLangResTarget_forui.mk
+++ b/formula/AllLangResTarget_forui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 6b7d01a1208a..4a70c4301905 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 3e38da6519d1..c46bd927196c 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk
index d5f58eab84b1..55a03c472ae0 100644
--- a/formula/Module_formula.mk
+++ b/formula/Module_formula.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/formula/Package_inc.mk b/formula/Package_inc.mk
index 11300cd1b92a..5cb8434d1e84 100644
--- a/formula/Package_inc.mk
+++ b/formula/Package_inc.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index 41d82a0f6690..48eb28cff665 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -1,5 +1,4 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -28,7 +27,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,hwpfilter_test_hwpfilter))
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index 40e8c737cd8b..49a7c80c126e 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/hwpfilter/Module_hwpfilter.mk b/hwpfilter/Module_hwpfilter.mk
index 95390e57b107..461c01793060 100644
--- a/hwpfilter/Module_hwpfilter.mk
+++ b/hwpfilter/Module_hwpfilter.mk
@@ -11,13 +11,12 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Major Contributor(s):
-#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
diff --git a/hwpfilter/qa/cppunit/test_hwpfilter.cxx b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
index cbd3aa0bdb20..18b6ebf91783 100644
--- a/hwpfilter/qa/cppunit/test_hwpfilter.cxx
+++ b/hwpfilter/qa/cppunit/test_hwpfilter.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 362ca4d8ddc7..88010ae4995e 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -1,5 +1,4 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -28,7 +27,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,lotuswordpro_test_lotuswordpro))
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 255d9178a148..af1e4b1b99e3 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk
index 193276786b80..bd1aff7ede3e 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -11,13 +11,12 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Major Contributor(s):
-#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 1f1f4e032aa1..81225e82bf1f 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/lotuswordpro/source/filter/clone.hxx b/lotuswordpro/source/filter/clone.hxx
index f671d06a5483..f539ca8105f9 100644
--- a/lotuswordpro/source/filter/clone.hxx
+++ b/lotuswordpro/source/filter/clone.hxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Red Hat, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
- * Contributor(s): David Tardon <dtardon@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.cxx b/lotuswordpro/source/filter/lwpbackgroundoverride.cxx
index fee6951a9976..dc32b5e4bb0b 100644
--- a/lotuswordpro/source/filter/lwpbackgroundoverride.cxx
+++ b/lotuswordpro/source/filter/lwpbackgroundoverride.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Red Hat, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
- * Contributor(s): David Tardon <dtardon@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/lotuswordpro/source/filter/lwptaboverride.cxx b/lotuswordpro/source/filter/lwptaboverride.cxx
index de863e7e6fdc..385457c2e754 100644
--- a/lotuswordpro/source/filter/lwptaboverride.cxx
+++ b/lotuswordpro/source/filter/lwptaboverride.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Red Hat, Inc.
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
- * Contributor(s): David Tardon <dtardon@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/offapi/com/sun/star/configuration/theDefaultProvider.idl b/offapi/com/sun/star/configuration/theDefaultProvider.idl
index 2fe61bc274a5..ecb86616a938 100644
--- a/offapi/com/sun/star/configuration/theDefaultProvider.idl
+++ b/offapi/com/sun/star/configuration/theDefaultProvider.idl
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
@@ -12,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/offapi/com/sun/star/i18n/Calendar2.idl b/offapi/com/sun/star/i18n/Calendar2.idl
index 0e1d9cc6640c..847f22ec5864 100644
--- a/offapi/com/sun/star/i18n/Calendar2.idl
+++ b/offapi/com/sun/star/i18n/Calendar2.idl
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 Eike Rathke <erack@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/offapi/com/sun/star/i18n/CalendarItem2.idl b/offapi/com/sun/star/i18n/CalendarItem2.idl
index a284441c279c..a88ffc993ea7 100644
--- a/offapi/com/sun/star/i18n/CalendarItem2.idl
+++ b/offapi/com/sun/star/i18n/CalendarItem2.idl
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 Eike Rathke <erack@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/offapi/com/sun/star/i18n/XCalendar3.idl b/offapi/com/sun/star/i18n/XCalendar3.idl
index 6bd7ef96992b..c9dd71b411a6 100644
--- a/offapi/com/sun/star/i18n/XCalendar3.idl
+++ b/offapi/com/sun/star/i18n/XCalendar3.idl
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 Eike Rathke <erack@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/offapi/com/sun/star/i18n/XLocaleData3.idl b/offapi/com/sun/star/i18n/XLocaleData3.idl
index 870f615afded..8597d9aa3c88 100644
--- a/offapi/com/sun/star/i18n/XLocaleData3.idl
+++ b/offapi/com/sun/star/i18n/XLocaleData3.idl
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 Eike Rathke <erack@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 7f26c8adf189..0b54125d72c8 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index ba74468c331d..538b36a77869 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -11,13 +11,12 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Major Contributor(s):
-#
# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index e1911ea7de1b..75138ea0bfc6 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index ac2ad7d6c775..9c7f5d33916b 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/oox/Package_tokens.mk b/oox/Package_tokens.mk
index 5eb2073589dc..67d3f439dc37 100644
--- a/oox/Package_tokens.mk
+++ b/oox/Package_tokens.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index efec684f2552..55aeeb0d9e9a 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index 9f2c6688218b..96f82fae8228 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index e3bffadd9b73..418e1c9d6d02 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index c8a7d9fa17d5..56ba2fd0aac7 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
index 3aef129c0e8c..e72e4301bf77 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/reportdesign/Package_uiconfig.mk b/reportdesign/Package_uiconfig.mk
index 0ab2c6d3c50b..99b3f11c65ac 100644
--- a/reportdesign/Package_uiconfig.mk
+++ b/reportdesign/Package_uiconfig.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sal/inc/internal/rtllifecycle.h b/sal/inc/internal/rtllifecycle.h
index 6e5ea81f97fd..31ccb47a576b 100644
--- a/sal/inc/internal/rtllifecycle.h
+++ b/sal/inc/internal/rtllifecycle.h
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/inc/sal/detail/log.h b/sal/inc/sal/detail/log.h
index bc51b89b6b14..8fc5776ce71e 100644
--- a/sal/inc/sal/detail/log.h
+++ b/sal/inc/sal/detail/log.h
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx
index 2e09c29e5aa9..93b00fd6b787 100644
--- a/sal/inc/sal/log.hxx
+++ b/sal/inc/sal/log.hxx
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx
index 6d8dee96c8a1..6d7d40bdd8fd 100644
--- a/sal/osl/all/log.cxx
+++ b/sal/osl/all/log.cxx
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/osl/all/logformat.hxx b/sal/osl/all/logformat.hxx
index bb6ea4cc6bdd..bb24f01180e3 100644
--- a/sal/osl/all/logformat.hxx
+++ b/sal/osl/all/logformat.hxx
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/osl/all/trace.cxx b/sal/osl/all/trace.cxx
index e0893d024fbf..2d96b7d645e5 100644
--- a/sal/osl/all/trace.cxx
+++ b/sal/osl/all/trace.cxx
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/osl/unx/createfilehandlefromfd.hxx b/sal/osl/unx/createfilehandlefromfd.hxx
index 116c074a2ce1..c32f99bf2ec7 100644
--- a/sal/osl/unx/createfilehandlefromfd.hxx
+++ b/sal/osl/unx/createfilehandlefromfd.hxx
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk
index eaa662877b84..ec35604f4fa5 100644
--- a/sal/qa/cppunit_local.mk
+++ b/sal/qa/cppunit_local.mk
@@ -1,21 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Red Hat, Inc.
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
-# Contributor(s): David Tardon <dtardon@redhat.com>
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
index b0234f92d518..372bd4ebe013 100644
--- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
+++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx
@@ -13,8 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
- * developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/sal/util/sal_textenc/makefile.mk b/sal/util/sal_textenc/makefile.mk
index 96a054098450..ec133ee98a2c 100644
--- a/sal/util/sal_textenc/makefile.mk
+++ b/sal/util/sal_textenc/makefile.mk
@@ -11,7 +11,7 @@
# License.
#
# Major Contributor(s):
-# [ Copyright (C) 2011 Stephan Bergmann, Red Hat Inc. <sbergman@redhat.com>
+# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
# (initial developer) ]
#
# All Rights Reserved.
diff --git a/sal/util/sal_textenc/saltextenc.map b/sal/util/sal_textenc/saltextenc.map
index a740f4c91b5b..86401fe47e88 100644
--- a/sal/util/sal_textenc/saltextenc.map
+++ b/sal/util/sal_textenc/saltextenc.map
@@ -11,8 +11,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 Stephan Bergmann, Red Hat Inc. <sbergman@redhat.com>
-# (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx
index eff82c814d0f..480f178523a1 100644
--- a/sal/workben/measure_oustrings.cxx
+++ b/sal/workben/measure_oustrings.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * [ Caolán McNamara <caolanm:redhat.com> ]
- * Portions created by Caolán McNamara are Copyright (C) 2010 * Red Hat, Inc.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
+ *
* All Rights Reserved.
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#include <sal/main.h>
#include <rtl/ustring.hxx>
#include <osl/time.h>
diff --git a/salhelper/inc/salhelper/linkhelper.hxx b/salhelper/inc/salhelper/linkhelper.hxx
index c8744dcca0b4..137ea06a5f1a 100644
--- a/salhelper/inc/salhelper/linkhelper.hxx
+++ b/salhelper/inc/salhelper/linkhelper.hxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#ifndef _SALHELPER_LINKHELPER_HXX
#define _SALHELPER_LINKHELPER_HXX
diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index 59de35f417bc..8e96211f157d 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -1,5 +1,4 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -12,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -26,7 +24,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sc_filters_test))
diff --git a/sc/CppunitTest_sc_macros_test.mk b/sc/CppunitTest_sc_macros_test.mk
index de530e2e3676..de7d44433eda 100644
--- a/sc/CppunitTest_sc_macros_test.mk
+++ b/sc/CppunitTest_sc_macros_test.mk
@@ -1,5 +1,4 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -12,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -26,7 +24,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sc_macros_test))
diff --git a/sc/CppunitTest_sc_subsequent_filters_test.mk b/sc/CppunitTest_sc_subsequent_filters_test.mk
index 31c2eaf57c96..8e5f645ad7e7 100644
--- a/sc/CppunitTest_sc_subsequent_filters_test.mk
+++ b/sc/CppunitTest_sc_subsequent_filters_test.mk
@@ -1,5 +1,4 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -12,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -26,7 +24,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,sc_subsequent_filters_test))
diff --git a/scp2/source/smoketest/makefile.mk b/scp2/source/smoketest/makefile.mk
index 27d0ee3d292c..5205444947a2 100644
--- a/scp2/source/smoketest/makefile.mk
+++ b/scp2/source/smoketest/makefile.mk
@@ -39,4 +39,4 @@ PARFILES= \
.INCLUDE: target.mk
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
+# vim:set shiftwidth=4 softtabstop=4 expandtab: #
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index e4875f8d6a96..64f8f3cd0d0e 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/CppunitTest_sd_filters_test.mk b/sd/CppunitTest_sd_filters_test.mk
index 6297faed5458..8ce430b58972 100644
--- a/sd/CppunitTest_sd_filters_test.mk
+++ b/sd/CppunitTest_sd_filters_test.mk
@@ -12,12 +12,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index d414115aadb4..d8d30ed6a156 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index a7ddccf03cfb..4f9fdc03ac9a 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 71cf76a24cb0..84f9b098e58e 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index a5c66b8036fd..3316acc8ba43 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index a2905b046e56..e57f4628e39f 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Package_inc.mk b/sd/Package_inc.mk
index 5547541012c3..6c981cdaa1d7 100644
--- a/sd/Package_inc.mk
+++ b/sd/Package_inc.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Package_uiconfig.mk b/sd/Package_uiconfig.mk
index c807cbb51b20..17552e48e203 100644
--- a/sd/Package_uiconfig.mk
+++ b/sd/Package_uiconfig.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Package_web.mk b/sd/Package_web.mk
index 7c02f26f3096..67acddbc8540 100644
--- a/sd/Package_web.mk
+++ b/sd/Package_web.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index 10e530408be4..544c406ecd83 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index 3a5edd671394..327d4d93e647 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index 9b09e4781760..be96512e302a 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index d8ead49326a5..fd1557ff3245 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 1e078272835a..187aae4f9520 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk
index d52e9c21ff43..5620457c60c4 100644
--- a/slideshow/Module_slideshow.mk
+++ b/slideshow/Module_slideshow.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index aa63f62e5e3b..99686cf17702 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gbuild/ComponentsTarget.mk b/solenv/gbuild/ComponentsTarget.mk
index 686a7eea966c..813443959615 100644
--- a/solenv/gbuild/ComponentsTarget.mk
+++ b/solenv/gbuild/ComponentsTarget.mk
@@ -1,4 +1,4 @@
-#
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -12,8 +12,8 @@
# License.
#
# Major Contributor(s):
-# [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial
-# developer) ]
+# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
@@ -24,7 +24,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
# Create a .components file bundling multiple .component files:
@@ -75,3 +74,5 @@ $(call gb_ComponentsTarget_get_clean_target,%).input:
$(call gb_Output_announce,$*,$(false),CPI,1)
$(call gb_Helper_abbreviate_dirs_native, \
rm -f $(call gb_ComponentsTarget_get_target,$*).input)
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk
index a18ef652e31e..37512fbeb6d1 100644
--- a/solenv/gbuild/Pyuno.mk
+++ b/solenv/gbuild/Pyuno.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 83a9c3319e91..6c2ba83fe774 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 53e571c72272..775f803040a3 100644
--- a/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DARM32
diff --git a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
index f63fc46cef80..82db0b3da364 100644
--- a/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
index 3052581150c1..403db532ba35 100644
--- a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk b/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
index f52773c9e26a..e3118c0cd2ea 100644
--- a/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk b/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
index 6353f38e1faf..a2c5deec8784 100644
--- a/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/LINUX_ARM_GCC.mk b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
index 72132ca72e73..330548810518 100644
--- a/solenv/gbuild/platform/LINUX_ARM_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DARM32
diff --git a/solenv/gbuild/platform/LINUX_AXP_GCC.mk b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
index b550995df59d..2c5082e36bcd 100644
--- a/solenv/gbuild/platform/LINUX_AXP_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -Os
diff --git a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
index 2bf9cf7618d4..b0769f5dd904 100644
--- a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DMIPS
diff --git a/solenv/gbuild/platform/LINUX_HPPA_GCC.mk b/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
index ac21c9088c44..a61b41389e88 100644
--- a/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/LINUX_IA64_GCC.mk b/solenv/gbuild/platform/LINUX_IA64_GCC.mk
index ac21c9088c44..a61b41389e88 100644
--- a/solenv/gbuild/platform/LINUX_IA64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_IA64_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/LINUX_INTEL_GCC.mk b/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
index 4410ed0e9c88..1758a63a4662 100644
--- a/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS := -DX86
diff --git a/solenv/gbuild/platform/LINUX_M68K_GCC.mk b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
index d7c0de18f74c..99d01fd9ef8c 100644
--- a/solenv/gbuild/platform/LINUX_M68K_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -Os
diff --git a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
index 3a3c685c34d7..33f6bd1d7179 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DPPC
diff --git a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
index 2ac40285f018..1c78df0cc1e2 100644
--- a/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_CPUDEFS += -DPPC
diff --git a/solenv/gbuild/platform/LINUX_S390X_GCC.mk b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
index 6f5fec935ff1..b35257204518 100644
--- a/solenv/gbuild/platform/LINUX_S390X_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/LINUX_S390_GCC.mk b/solenv/gbuild/platform/LINUX_S390_GCC.mk
index 6f5fec935ff1..b35257204518 100644
--- a/solenv/gbuild/platform/LINUX_S390_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_S390_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/LINUX_SPARC_GCC.mk b/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
index bfb3ad4d4a78..962ef111725c 100644
--- a/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -Os
diff --git a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
index ac21c9088c44..a61b41389e88 100644
--- a/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk or linux.mk
gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index eaf504dc068a..c0c31c9181ed 100644
--- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk b/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk
index af72c5044a59..a426e2f8321d 100644
--- a/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk b/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk
index af72c5044a59..a426e2f8321d 100644
--- a/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
index af72c5044a59..a426e2f8321d 100644
--- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
index 090530d35903..17b271526ade 100644
--- a/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
index 00201206bbff..89724a675afb 100644
--- a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
+++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
#please make generic modifications to unxgcc.mk
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 1c14545db680..71508f2936ec 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -1,32 +1,29 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
-# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#
-#*************************************************************************
gb_LinkTarget_LDFLAGS += \
-Wl,-z,defs \
diff --git a/solenv/gdb/autoload.template b/solenv/gdb/autoload.template
index 3351606975c2..4105c8cfd3fc 100644
--- a/solenv/gdb/autoload.template
+++ b/solenv/gdb/autoload.template
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/__init__.py b/solenv/gdb/libreoffice/__init__.py
index 90d8012bccb9..a3b4f4b7ca6b 100644
--- a/solenv/gdb/libreoffice/__init__.py
+++ b/solenv/gdb/libreoffice/__init__.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -26,5 +26,4 @@
# instead of those above.
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gdb/libreoffice/cppu.py b/solenv/gdb/libreoffice/cppu.py
index 8707ea57bf88..340325163cc5 100644
--- a/solenv/gdb/libreoffice/cppu.py
+++ b/solenv/gdb/libreoffice/cppu.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/sal.py b/solenv/gdb/libreoffice/sal.py
index e5a5d32f668a..15cebe84d673 100644
--- a/solenv/gdb/libreoffice/sal.py
+++ b/solenv/gdb/libreoffice/sal.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/svl.py b/solenv/gdb/libreoffice/svl.py
index 639f7c55c93f..57d60d9374b1 100644
--- a/solenv/gdb/libreoffice/svl.py
+++ b/solenv/gdb/libreoffice/svl.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/sw.py b/solenv/gdb/libreoffice/sw.py
index f41533a35204..2e0753821eab 100644
--- a/solenv/gdb/libreoffice/sw.py
+++ b/solenv/gdb/libreoffice/sw.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/tl.py b/solenv/gdb/libreoffice/tl.py
index 62c5ff52fdd0..4f944f030008 100644
--- a/solenv/gdb/libreoffice/tl.py
+++ b/solenv/gdb/libreoffice/tl.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/util/__init__.py b/solenv/gdb/libreoffice/util/__init__.py
index 90d8012bccb9..a3b4f4b7ca6b 100644
--- a/solenv/gdb/libreoffice/util/__init__.py
+++ b/solenv/gdb/libreoffice/util/__init__.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -26,5 +26,4 @@
# instead of those above.
-
# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/solenv/gdb/libreoffice/util/compatibility.py b/solenv/gdb/libreoffice/util/compatibility.py
index 3011f931bd1f..3419fa9cf534 100644
--- a/solenv/gdb/libreoffice/util/compatibility.py
+++ b/solenv/gdb/libreoffice/util/compatibility.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/util/printing.py b/solenv/gdb/libreoffice/util/printing.py
index e1f55b3e72dd..a315603ab5dd 100644
--- a/solenv/gdb/libreoffice/util/printing.py
+++ b/solenv/gdb/libreoffice/util/printing.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/util/string.py b/solenv/gdb/libreoffice/util/string.py
index e2db62211803..e85999a49df8 100644
--- a/solenv/gdb/libreoffice/util/string.py
+++ b/solenv/gdb/libreoffice/util/string.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/libreoffice/util/uno.py b/solenv/gdb/libreoffice/util/uno.py
index 23cf06ad6f68..a3190d59a138 100644
--- a/solenv/gdb/libreoffice/util/uno.py
+++ b/solenv/gdb/libreoffice/util/uno.py
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/solenv/gdb/makefile.mk b/solenv/gdb/makefile.mk
index 9e4383d2b4e0..0c8df242bfbf 100644
--- a/solenv/gdb/makefile.mk
+++ b/solenv/gdb/makefile.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -10,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sot/qa/cppunit/test_sot.cxx b/sot/qa/cppunit/test_sot.cxx
index b695e8076e65..36d0b02ffe6b 100644
--- a/sot/qa/cppunit/test_sot.cxx
+++ b/sot/qa/cppunit/test_sot.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index 4a66845c649c..fff47e14b1c2 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/starmath/qa/cppunit/test_starmath.cxx b/starmath/qa/cppunit/test_starmath.cxx
index a9be9ee50809..fbb9fb70373c 100644
--- a/starmath/qa/cppunit/test_starmath.cxx
+++ b/starmath/qa/cppunit/test_starmath.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#include "sal/config.h"
#include "sal/precppunit.hxx"
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 48c39f461b01..7c51be8cbfa8 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -1,5 +1,4 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -12,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
@@ -26,7 +24,6 @@
# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
-#*************************************************************************
$(eval $(call gb_CppunitTest_CppunitTest,svtools_filters_test))
diff --git a/sw/CppunitTest_sw_filters_test.mk b/sw/CppunitTest_sw_filters_test.mk
index ccf62124984d..3b31eb9bd813 100644
--- a/sw/CppunitTest_sw_filters_test.mk
+++ b/sw/CppunitTest_sw_filters_test.mk
@@ -12,12 +12,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sw/CppunitTest_sw_macros_test.mk b/sw/CppunitTest_sw_macros_test.mk
index 25b835792bd3..9c2c11f04cfa 100644
--- a/sw/CppunitTest_sw_macros_test.mk
+++ b/sw/CppunitTest_sw_macros_test.mk
@@ -12,12 +12,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index fc06cacea799..e18b0c8d52c8 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -12,12 +12,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/sw/source/ui/app/swdllimpl.hxx b/sw/source/ui/app/swdllimpl.hxx
index 1f7c17eeaff7..cce2b2920f0d 100644
--- a/sw/source/ui/app/swdllimpl.hxx
+++ b/sw/source/ui/app/swdllimpl.hxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#ifndef SWDLL_IMPL_INCLUDE
#define SWDLL_IMPL_INCLUDE
diff --git a/sw/source/ui/inc/titlepage.hxx b/sw/source/ui/inc/titlepage.hxx
index 5f102e008201..fbbe6742fb2b 100644
--- a/sw/source/ui/inc/titlepage.hxx
+++ b/sw/source/ui/inc/titlepage.hxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#ifndef _SWTITLEPAGE_HXX
#define _SWTITLEPAGE_HXX
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 0cc2ea446110..759242e43fcd 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/sw/source/ui/misc/titlepage.hrc b/sw/source/ui/misc/titlepage.hrc
index 63678427cfca..191581bec21f 100644
--- a/sw/source/ui/misc/titlepage.hrc
+++ b/sw/source/ui/misc/titlepage.hrc
@@ -1,22 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -24,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#define FL_MAKEINSERT 1
#define RB_USE_EXISTING_PAGES 2
#define RB_INSERT_NEW_PAGES 3
diff --git a/sw/source/ui/misc/titlepage.src b/sw/source/ui/misc/titlepage.src
index f23dfcfff2ee..aff142e496b8 100644
--- a/sw/source/ui/misc/titlepage.src
+++ b/sw/source/ui/misc/titlepage.src
@@ -1,22 +1,24 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* Version: MPL 1.1 / GPLv3+ / LGPLv3+
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/ucb/source/ucp/webdav/warnings_guard_ne_locks.h b/ucb/source/ucp/webdav/warnings_guard_ne_locks.h
index c5ee6a0ed369..44fa99da7e21 100644
--- a/ucb/source/ucp/webdav/warnings_guard_ne_locks.h
+++ b/ucb/source/ucp/webdav/warnings_guard_ne_locks.h
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Eike Rathke <erack@redhat.com> (initial developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/unodevtools/source/skeletonmaker/ostringostreaminserter.hxx b/unodevtools/source/skeletonmaker/ostringostreaminserter.hxx
index 9339d1ae2a4b..f4e35a364d7e 100644
--- a/unodevtools/source/skeletonmaker/ostringostreaminserter.hxx
+++ b/unodevtools/source/skeletonmaker/ostringostreaminserter.hxx
@@ -13,7 +13,7 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann, Red Hat Inc. <sbergman@redhat.com>
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com>
* (initial developer) ]
*
* All Rights Reserved.
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index 998a9fa84d08..e9f252d53792 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index 27a5cb375df9..58d91273506b 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/vcl/Package_kde4moc.mk b/vcl/Package_kde4moc.mk
index 180689ab7ef9..6924aa07d677 100644
--- a/vcl/Package_kde4moc.mk
+++ b/vcl/Package_kde4moc.mk
@@ -3,20 +3,21 @@
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolan McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
#
-# Contributor(s):
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/inc/unx/gtk/gtkprn.hxx b/vcl/inc/unx/gtk/gtkprn.hxx
index 0069d596cb1d..f24d2c2a1428 100644
--- a/vcl/inc/unx/gtk/gtkprn.hxx
+++ b/vcl/inc/unx/gtk/gtkprn.hxx
@@ -13,8 +13,9 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 Caolán McNamara, Red Hat Inc. <caolan@redhat.com> (initial developer)
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com> ]
*
* All Rights Reserved.
*
@@ -27,6 +28,7 @@
* instead of those above.
*/
+
#ifndef UNX_GTK_GTKPRN_HXX_INCLUDED
#define UNX_GTK_GTKPRN_HXX_INCLUDED
diff --git a/vcl/inc/vcl/fontcapabilities.hxx b/vcl/inc/vcl/fontcapabilities.hxx
index 1869cc97d1b2..20e5c579b98a 100644
--- a/vcl/inc/vcl/fontcapabilities.hxx
+++ b/vcl/inc/vcl/fontcapabilities.hxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
@@ -25,6 +26,7 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
+
#ifndef _VCLFONTCAPABILITIES_HXX
#define _VCLFONTCAPABILITIES_HXX
diff --git a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
index 6d1c64bc2d8b..6ecfd1d8d4e1 100644
--- a/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
+++ b/vcl/unx/gtk/gdi/gtkprintwrapper.cxx
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 15b4030feaa7..3db1dfe4ebea 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -13,8 +13,9 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 Caolán McNamara, Red Hat Inc. <caolan@redhat.com> (initial developer)
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com
+ * Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com> ]
*
* All Rights Reserved.
*
diff --git a/vcl/unx/gtk/inc/gtkprintwrapper.hxx b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
index 1df133a99548..a3cd3337bdc1 100644
--- a/vcl/unx/gtk/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk/inc/gtkprintwrapper.hxx
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
index 80593f6af67c..1412f37234be 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkaction.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
index f7babdb8d95f..e5334a620e2d 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkbridge.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx b/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
index 8c300b125d79..b491eb442c3c 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx b/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
index ae91ac31c63e..ae76a06c067f 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx b/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
index 2a3c0dc8d76a..9c14ec1c6cf8 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkfactory.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx b/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
index f6b8cb651ffb..408fc1599381 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
index 8167f6e8ecc9..7018b7a7b748 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkimage.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
index 76ad3ba5c6ea..71e5893f10a4 100644
--- a/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atklistener.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx b/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
index 3ad55519a892..6f416f2b2327 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkregistry.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkselection.cxx b/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
index b233bbee9ef5..18c149022c0b 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkselection.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atktable.cxx b/vcl/unx/gtk3/a11y/gtk3atktable.cxx
index bc0f473a773c..eb209023e2b5 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktable.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktable.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atktext.cxx b/vcl/unx/gtk3/a11y/gtk3atktext.cxx
index f6f69af3b4be..d17ca9eb6d4f 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktext.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktext.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
index 85ecf50da8bd..40977545a47f 100644
--- a/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
index 183a33c3ac27..9fcb760c1c3b 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkutil.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx b/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
index 346d7672d6d2..9265a4db88ee 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkvalue.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx b/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
index c93b0ff4a8de..5caa72619f7a 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkwindow.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
index fbcecd3495f8..afe78a2621ff 100644
--- a/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
+++ b/vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/app/gtk3gtkdata.cxx b/vcl/unx/gtk3/app/gtk3gtkdata.cxx
index 01d5c59104ca..afddb287ea0b 100644
--- a/vcl/unx/gtk3/app/gtk3gtkdata.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkdata.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 7d10b89e62a6..2600677bac56 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/app/gtk3gtksys.cxx b/vcl/unx/gtk3/app/gtk3gtksys.cxx
index 8b103fa28e61..51a1c2d87f0f 100644
--- a/vcl/unx/gtk3/app/gtk3gtksys.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtksys.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx b/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx
index 272d6d63f874..2ff0f3e57621 100644
--- a/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
index 1a9f5b920fa8..97e911fa1b9a 100644
--- a/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx b/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx
index 89bdeb82f787..745bbdc7b5a3 100644
--- a/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx
+++ b/vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx b/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
index 5ceb651d4326..a65058447883 100644
--- a/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
+++ b/vcl/unx/gtk3/inc/gtkprintwrapper.hxx
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
diff --git a/vcl/unx/gtk3/window/gtk3gtkframe.cxx b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
index 47cbf2f41893..be4d6788ec91 100644
--- a/vcl/unx/gtk3/window/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/window/gtk3gtkframe.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/gtk3/window/gtk3gtkobject.cxx b/vcl/unx/gtk3/window/gtk3gtkobject.cxx
index e91c849d8dff..f3cda4a88da4 100644
--- a/vcl/unx/gtk3/window/gtk3gtkobject.cxx
+++ b/vcl/unx/gtk3/window/gtk3gtkobject.cxx
@@ -4,20 +4,21 @@
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
- * The Initial Developer of the Original Code is
- * Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
- * Portions created by the Initial Developer are Copyright (C) 2010 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+ * (initial developer)
*
- * Contributor(s): Caolán McNamara <caolanm@redhat.com>
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/kde4/Makefile b/vcl/unx/kde4/Makefile
index 4259715656f4..88cda66fe1da 100644
--- a/vcl/unx/kde4/Makefile
+++ b/vcl/unx/kde4/Makefile
@@ -1,21 +1,23 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
#
# Software distributed under the License is distributed on an "AS IS" basis,
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# Caolan McNamara <caolanm@redhat.com> (Red Hat, Inc.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
+# (initial developer)
#
-# Contributor(s):
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
#
# Alternatively, the contents of this file may be used under the terms of
# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
diff --git a/vcl/unx/kde4/warning_guard_qhash.h b/vcl/unx/kde4/warning_guard_qhash.h
index 156506b87f1b..3ff5f69cf6c2 100644
--- a/vcl/unx/kde4/warning_guard_qhash.h
+++ b/vcl/unx/kde4/warning_guard_qhash.h
@@ -13,7 +13,8 @@
* License.
*
* Major Contributor(s):
- * [ Copyright (C) 2011 Eike Rathke <erack@redhat.com> (initial developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Eike Rathke <erack@redhat.com>
+ * (initial developer)
*
* All Rights Reserved.
*
@@ -25,7 +26,6 @@
* in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
* instead of those above.
*/
-
#ifndef INCLUDED_WARNINGS_GUARD_QHASH_H
#define INCLUDED_WARNINGS_GUARD_QHASH_H
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index 3c52e1d7e4f4..fb7ac105bb84 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index a0acbc5785d1..fa1e35073e1b 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
@@ -11,7 +12,8 @@
# License.
#
# Major Contributor(s):
-# Copyright (C) 2011 David Tardon, Red Hat Inc. <dtardon@redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
#
# All Rights Reserved.
#
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index 5be4387123e6..43f36b0284af 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index d2f52f5e5569..f4a1fe2763ff 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index f485ef73e062..8f999d6a305e 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index 5866dc3f9d03..9ee5cde08440 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 087ef262428d..e0c4f88556b6 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 2e9e61dd1907..3f4c3bde2f0c 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 83946c2c5edf..a35daa90de82 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -11,12 +11,11 @@
# for the specific language governing rights and limitations under the
# License.
#
-# The Initial Developer of the Original Code is
-# David Tardon, Red Hat Inc. <dtardon@redhat.com>
-# Portions created by the Initial Developer are Copyright (C) 2010 the
-# Initial Developer. All Rights Reserved.
-#
# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+# (initial developer)
+#
+# All Rights Reserved.
#
# For minor contributions see the git repository.
#