[Libreoffice-commits] .: 2 commits - automation/AllLangResTarget_tma.mk automation/Executable_miniapp.mk automation/Executable_testtool.mk automation/inc automation/Library_communi.mk automation/Library_simplecm.mk automation/Library_sts.mk automation/Module_automation.mk automation/Package_hid.mk automation/Package_inc.mk automation/Package_packimages.mk automation/Package_testtool.mk automation/packimages automation/source bin/get-bugzilla-attachments-by-mimetype chart2/AllLangResTarget_chartcontroller.mk chart2/Library_chartcontroller.mk chart2/Library_chartmodel.mk chart2/Library_charttools.mk chart2/Library_chartview.mk chart2/Package_uiconfig.mk comphelper/CppunitTest_comphelper_test.mk comphelper/inc comphelper/source cui/AllLangResTarget_cui.mk cui/Library_cui.mk cui/Module_cui.mk dbaccess/AllLangResTarget_adabasui.mk dbaccess/AllLangResTarget_dba.mk dbaccess/AllLangResTarget_dbmm.mk dbaccess/AllLangResTarget_dbu.mk dbaccess/AllLangResTarget_sdbt.mk dbaccess/Executable_odbcconfig. mk dbaccess/Library_adabasui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk dbaccess/Package_inc.mk dbaccess/Package_uiconfig.mk desktop/AllLangResTarget_deploymentgui.mk desktop/AllLangResTarget_deployment.mk desktop/AllLangResTarget_dkt.mk desktop/branding desktop/Executable_crashrep.com.mk desktop/Executable_officeloader.mk desktop/Executable_oosplash.mk desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Executable_unoinfo.mk desktop/Executable_unopkg.bin.mk desktop/Executable_unopkg.com.mk desktop/Executable_unopkg.mk desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/Library_migrationoo2. mk desktop/Library_migrationoo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library_spl.mk desktop/Library_spl_unx.mk desktop/Library_unopkgapp.mk desktop/Module_desktop.mk desktop/Package_branding.mk desktop/Package_intro.mk desktop/Package_scripts.mk desktop/Pagein_calc.mk desktop/Pagein_common.mk desktop/Pagein_draw.mk desktop/Pagein_impress.mk desktop/Pagein.mk desktop/Pagein_writer.mk desktop/source desktop/WinResTarget_quickstart.mk desktop/WinResTarget_sbase.mk desktop/WinResTarget_scalc.mk desktop/WinResTarget_sdraw.mk desktop/WinResTarget_simpress.mk desktop/WinResTarget_smath.mk desktop/WinResTarget_soffice.mk desktop/WinResTarget_sweb.mk desktop/WinResTarget_swriter.mk desktop/Zip_brand_dev.mk desktop/Zip_brand.mk desktop/Zip_shell.mk drawinglayer/inc drawinglayer/Library_drawinglayer.mk drawinglayer/Module_drawinglayer.mk drawinglayer/Package_inc.mk extensions/Module_extensions.mk fileaccess/Library_fileacc.mk fileaccess/Module_fileaccess.m k forms/AllLangResTarget_frm.mk forms/Library_frm.mk forms/Package_unotypes.mk formula/AllLangResTarget_for.mk formula/AllLangResTarget_forui.mk formula/Library_for.mk formula/Library_forui.mk formula/Module_formula.mk formula/Package_inc.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk hwpfilter/Module_hwpfilter.mk hwpfilter/qa lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk lotuswordpro/Module_lotuswordpro.mk lotuswordpro/qa lotuswordpro/source offapi/com oox/Library_oox.mk oox/Module_oox.mk oox/Package_generated.mk oox/Package_inc.mk oox/Package_tokens.mk reportdesign/AllLangResTarget_rpt.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk reportdesign/Module_reportdesign.mk reportdesign/Package_uiconfig.mk salhelper/inc sal/inc sal/osl sal/qa sal/util sal/workben sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_subsequent_filte rs_test.mk sc/JunitTest_sc_complex.mk sc/JunitTest_sc_unoapi.mk scp2/source sc/qa sd/AllLangResTarget_sd.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_uimpress.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sd/Package_inc.mk sd/Package_uiconfig.mk sd/Package_web.mk sd/Package_xml.mk slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk slideshow/Module_slideshow.mk solenv/bin solenv/gbuild solenv/gdb sot/qa starmath/CppunitTest_starmath_qa_cppunit.mk starmath/qa svtools/CppunitTest_svtools_filters_test.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_swdoc_test.mk sw/qa sw/source test/user-template ucb/source unodevtools/source unotools/Library_utl.mk unotools/Package_inc.mk vcl/inc vcl/Package_kde4moc.mk vcl/unx wizards/Pyuno_commonwizards.mk wizards/Pyuno_fax.mk writerfilter/Library_doctok.mk writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk writerfilter/Library_rtftok.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk writerfilter/Module_writerfilter.mk

• Previous message: [Libreoffice-commits] .: vcl/source
• Next message: [Libreoffice-commits] .: binfilter/qa
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

 automation/AllLangResTarget_tma.mk                           |    4 
 automation/Executable_miniapp.mk                             |    4 
 automation/Executable_testtool.mk                            |    4 
 automation/Library_communi.mk                                |    4 
 automation/Library_simplecm.mk                               |    4 
 automation/Library_sts.mk                                    |    4 
 automation/Module_automation.mk                              |    4 
 automation/Package_hid.mk                                    |    4 
 automation/Package_inc.mk                                    |    4 
 automation/Package_packimages.mk                             |    4 
 automation/Package_testtool.mk                               |    4 
 automation/inc/automation/communidllapi.h                    |    3 
 automation/inc/automation/simplecmdllapi.h                   |    3 
 automation/inc/automation/stsdllapi.h                        |    3 
 automation/packimages/Makefile                               |    4 
 automation/source/testtool/Makefile                          |    5 -
 bin/get-bugzilla-attachments-by-mimetype                     |   12 --
 chart2/AllLangResTarget_chartcontroller.mk                   |    9 -
 chart2/Library_chartcontroller.mk                            |    9 -
 chart2/Library_chartmodel.mk                                 |    9 -
 chart2/Library_charttools.mk                                 |    9 -
 chart2/Library_chartview.mk                                  |    9 -
 chart2/Package_uiconfig.mk                                   |    9 -
 comphelper/CppunitTest_comphelper_test.mk                    |   11 --
 comphelper/inc/comphelper/scoped_disposing_ptr.hxx           |   16 +--
 comphelper/inc/comphelper/xmltools.hxx                       |   16 +--
 comphelper/source/xml/xmltools.cxx                           |   16 +--
 cui/AllLangResTarget_cui.mk                                  |    9 -
 cui/Library_cui.mk                                           |    9 -
 cui/Module_cui.mk                                            |    9 -
 dbaccess/AllLangResTarget_adabasui.mk                        |    9 -
 dbaccess/AllLangResTarget_dba.mk                             |    9 -
 dbaccess/AllLangResTarget_dbmm.mk                            |    9 -
 dbaccess/AllLangResTarget_dbu.mk                             |    9 -
 dbaccess/AllLangResTarget_sdbt.mk                            |    9 -
 dbaccess/Executable_odbcconfig.mk                            |    9 -
 dbaccess/Library_adabasui.mk                                 |    9 -
 dbaccess/Library_dba.mk                                      |    9 -
 dbaccess/Library_dbaxml.mk                                   |    9 -
 dbaccess/Library_dbmm.mk                                     |    9 -
 dbaccess/Library_dbu.mk                                      |    9 -
 dbaccess/Library_sdbt.mk                                     |    9 -
 dbaccess/Package_inc.mk                                      |    9 -
 dbaccess/Package_uiconfig.mk                                 |    9 -
 desktop/AllLangResTarget_deployment.mk                       |    4 
 desktop/AllLangResTarget_deploymentgui.mk                    |    4 
 desktop/AllLangResTarget_dkt.mk                              |    4 
 desktop/Executable_crashrep.com.mk                           |    4 
 desktop/Executable_officeloader.mk                           |    4 
 desktop/Executable_oosplash.mk                               |    4 
 desktop/Executable_quickstart.mk                             |    4 
 desktop/Executable_sbase.mk                                  |    4 
 desktop/Executable_scalc.mk                                  |    4 
 desktop/Executable_sdraw.mk                                  |    4 
 desktop/Executable_simpress.mk                               |    4 
 desktop/Executable_smath.mk                                  |    4 
 desktop/Executable_soffice.bin.mk                            |    4 
 desktop/Executable_soffice.mk                                |    4 
 desktop/Executable_sweb.mk                                   |    4 
 desktop/Executable_swriter.mk                                |    4 
 desktop/Executable_unoinfo.mk                                |    4 
 desktop/Executable_unopkg.bin.mk                             |    4 
 desktop/Executable_unopkg.com.mk                             |    4 
 desktop/Executable_unopkg.mk                                 |    4 
 desktop/Library_deployment.mk                                |    4 
 desktop/Library_deploymentgui.mk                             |    4 
 desktop/Library_deploymentmisc.mk                            |    4 
 desktop/Library_migrationoo2.mk                              |    4 
 desktop/Library_migrationoo3.mk                              |    4 
 desktop/Library_offacc.mk                                    |    4 
 desktop/Library_sofficeapp.mk                                |    4 
 desktop/Library_spl.mk                                       |    4 
 desktop/Library_spl_unx.mk                                   |    4 
 desktop/Library_unopkgapp.mk                                 |    4 
 desktop/Module_desktop.mk                                    |    4 
 desktop/Package_branding.mk                                  |    4 
 desktop/Package_intro.mk                                     |    4 
 desktop/Package_scripts.mk                                   |    4 
 desktop/Pagein.mk                                            |    4 
 desktop/Pagein_calc.mk                                       |    4 
 desktop/Pagein_common.mk                                     |    4 
 desktop/Pagein_draw.mk                                       |    4 
 desktop/Pagein_impress.mk                                    |    4 
 desktop/Pagein_writer.mk                                     |    4 
 desktop/WinResTarget_quickstart.mk                           |    4 
 desktop/WinResTarget_sbase.mk                                |    4 
 desktop/WinResTarget_scalc.mk                                |    4 
 desktop/WinResTarget_sdraw.mk                                |    4 
 desktop/WinResTarget_simpress.mk                             |    4 
 desktop/WinResTarget_smath.mk                                |    4 
 desktop/WinResTarget_soffice.mk                              |    4 
 desktop/WinResTarget_sweb.mk                                 |    4 
 desktop/WinResTarget_swriter.mk                              |    4 
 desktop/Zip_brand.mk                                         |    4 
 desktop/Zip_brand_dev.mk                                     |    4 
 desktop/Zip_shell.mk                                         |    4 
 desktop/branding/Makefile                                    |    4 
 desktop/source/inc/desktopdllapi.h                           |    4 
 drawinglayer/Library_drawinglayer.mk                         |    9 -
 drawinglayer/Module_drawinglayer.mk                          |    9 -
 drawinglayer/Package_inc.mk                                  |    9 -
 drawinglayer/inc/drawinglayer/drawinglayerdllapi.h           |    9 -
 extensions/Module_extensions.mk                              |    1 
 fileaccess/Library_fileacc.mk                                |   10 --
 fileaccess/Module_fileaccess.mk                              |   10 --
 forms/AllLangResTarget_frm.mk                                |    9 -
 forms/Library_frm.mk                                         |    9 -
 forms/Package_unotypes.mk                                    |    9 -
 formula/AllLangResTarget_for.mk                              |    9 -
 formula/AllLangResTarget_forui.mk                            |    9 -
 formula/Library_for.mk                                       |    9 -
 formula/Library_forui.mk                                     |    9 -
 formula/Module_formula.mk                                    |    9 -
 formula/Package_inc.mk                                       |    9 -
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk            |    2 
 hwpfilter/Library_hwp.mk                                     |    9 -
 hwpfilter/Module_hwpfilter.mk                                |   11 +-
 hwpfilter/qa/cppunit/test_hwpfilter.cxx                      |   15 +--
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk   |    2 
 lotuswordpro/Library_lwpft.mk                                |    9 -
 lotuswordpro/Module_lotuswordpro.mk                          |   11 +-
 lotuswordpro/qa/cppunit/test_lotuswordpro.cxx                |   15 +--
 lotuswordpro/source/filter/clone.hxx                         |   15 +--
 lotuswordpro/source/filter/lwpbackgroundoverride.cxx         |   15 +--
 lotuswordpro/source/filter/lwptaboverride.cxx                |   15 +--
 offapi/com/sun/star/configuration/theDefaultProvider.idl     |    5 -
 offapi/com/sun/star/i18n/Calendar2.idl                       |    3 
 offapi/com/sun/star/i18n/CalendarItem2.idl                   |    3 
 offapi/com/sun/star/i18n/XCalendar3.idl                      |    3 
 offapi/com/sun/star/i18n/XLocaleData3.idl                    |    3 
 oox/Library_oox.mk                                           |    9 -
 oox/Module_oox.mk                                            |   11 +-
 oox/Package_generated.mk                                     |    9 -
 oox/Package_inc.mk                                           |    9 -
 oox/Package_tokens.mk                                        |    9 -
 reportdesign/AllLangResTarget_rpt.mk                         |    9 -
 reportdesign/Library_rpt.mk                                  |    9 -
 reportdesign/Library_rptui.mk                                |    9 -
 reportdesign/Library_rptxml.mk                               |    9 -
 reportdesign/Module_reportdesign.mk                          |    9 -
 reportdesign/Package_uiconfig.mk                             |    9 -
 sal/inc/internal/rtllifecycle.h                              |    4 
 sal/inc/sal/detail/log.h                                     |    4 
 sal/inc/sal/log.hxx                                          |    4 
 sal/osl/all/log.cxx                                          |    4 
 sal/osl/all/logformat.hxx                                    |    4 
 sal/osl/all/trace.cxx                                        |    4 
 sal/osl/unx/createfilehandlefromfd.hxx                       |    4 
 sal/qa/cppunit_local.mk                                      |   16 +--
 sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx |    4 
 sal/util/sal_textenc/makefile.mk                             |    2 
 sal/util/sal_textenc/saltextenc.map                          |    4 
 sal/workben/measure_oustrings.cxx                            |   14 +-
 salhelper/inc/salhelper/linkhelper.hxx                       |   16 +--
 sc/CppunitTest_sc_filters_test.mk                            |   11 --
 sc/CppunitTest_sc_macros_test.mk                             |   11 --
 sc/CppunitTest_sc_subsequent_filters_test.mk                 |   11 --
 sc/JunitTest_sc_complex.mk                                   |   55 +++++------
 sc/JunitTest_sc_unoapi.mk                                    |   55 +++++------
 sc/qa/extras/macros-test.cxx                                 |   18 +--
 sc/qa/unit/filters-test.cxx                                  |   17 +--
 sc/qa/unit/subsequent_filters-test.cxx                       |   16 +--
 scp2/source/smoketest/makefile.mk                            |    2 
 sd/AllLangResTarget_sd.mk                                    |    9 -
 sd/CppunitTest_sd_filters_test.mk                            |    9 -
 sd/CppunitTest_sd_uimpress.mk                                |    9 -
 sd/Library_sd.mk                                             |    9 -
 sd/Library_sdd.mk                                            |    9 -
 sd/Library_sdfilt.mk                                         |    9 -
 sd/Library_sdui.mk                                           |    9 -
 sd/Package_inc.mk                                            |    9 -
 sd/Package_uiconfig.mk                                       |    9 -
 sd/Package_web.mk                                            |    9 -
 sd/Package_xml.mk                                            |    9 -
 slideshow/CppunitTest_slideshow.mk                           |    9 -
 slideshow/Executable_demoshow.mk                             |    9 -
 slideshow/Library_OGLTrans.mk                                |    9 -
 slideshow/Library_slideshow.mk                               |    9 -
 slideshow/Module_slideshow.mk                                |    9 -
 solenv/bin/install-gdb-printers                              |    9 -
 solenv/gbuild/ComponentsTarget.mk                            |    9 +
 solenv/gbuild/Pyuno.mk                                       |    4 
 solenv/gbuild/RdbTarget.mk                                   |    9 -
 solenv/gbuild/platform/ANDROID_ARM_GCC.mk                    |   19 +--
 solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk                |   19 +--
 solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk               |   19 +--
 solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk                  |   19 +--
 solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk                 |   19 +--
 solenv/gbuild/platform/LINUX_ARM_GCC.mk                      |   19 +--
 solenv/gbuild/platform/LINUX_AXP_GCC.mk                      |   19 +--
 solenv/gbuild/platform/LINUX_GODSON_GCC.mk                   |   19 +--
 solenv/gbuild/platform/LINUX_HPPA_GCC.mk                     |   19 +--
 solenv/gbuild/platform/LINUX_IA64_GCC.mk                     |   19 +--
 solenv/gbuild/platform/LINUX_INTEL_GCC.mk                    |   19 +--
 solenv/gbuild/platform/LINUX_M68K_GCC.mk                     |   19 +--
 solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk                |   19 +--
 solenv/gbuild/platform/LINUX_POWERPC_GCC.mk                  |   19 +--
 solenv/gbuild/platform/LINUX_S390X_GCC.mk                    |   19 +--
 solenv/gbuild/platform/LINUX_S390_GCC.mk                     |   19 +--
 solenv/gbuild/platform/LINUX_SPARC_GCC.mk                    |   19 +--
 solenv/gbuild/platform/LINUX_X86_64_GCC.mk                   |   19 +--
 solenv/gbuild/platform/NETBSD_INTEL_GCC.mk                   |   19 +--
 solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk                 |   19 +--
 solenv/gbuild/platform/NETBSD_SPARC_GCC.mk                   |   19 +--
 solenv/gbuild/platform/NETBSD_X86_64_GCC.mk                  |   19 +--
 solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk                  |   19 +--
 solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk                 |   19 +--
 solenv/gbuild/platform/linux.mk                              |   19 +--
 solenv/gdb/autoload.template                                 |   10 +-
 solenv/gdb/libreoffice/__init__.py                           |   11 +-
 solenv/gdb/libreoffice/cppu.py                               |   10 +-
 solenv/gdb/libreoffice/sal.py                                |   10 +-
 solenv/gdb/libreoffice/svl.py                                |   10 +-
 solenv/gdb/libreoffice/sw.py                                 |   10 +-
 solenv/gdb/libreoffice/tl.py                                 |   10 +-
 solenv/gdb/libreoffice/util/__init__.py                      |   11 +-
 solenv/gdb/libreoffice/util/compatibility.py                 |   10 +-
 solenv/gdb/libreoffice/util/printing.py                      |   10 +-
 solenv/gdb/libreoffice/util/string.py                        |   10 +-
 solenv/gdb/libreoffice/util/uno.py                           |   10 +-
 solenv/gdb/makefile.mk                                       |   10 +-
 sot/qa/cppunit/test_sot.cxx                                  |   15 +--
 starmath/CppunitTest_starmath_qa_cppunit.mk                  |    9 -
 starmath/qa/cppunit/test_starmath.cxx                        |   16 +--
 svtools/CppunitTest_svtools_filters_test.mk                  |   11 --
 sw/CppunitTest_sw_filters_test.mk                            |    9 -
 sw/CppunitTest_sw_macros_test.mk                             |    9 -
 sw/CppunitTest_sw_swdoc_test.mk                              |    9 -
 sw/qa/core/filters-test.cxx                                  |   16 +--
 sw/qa/core/macros-test.cxx                                   |   18 +--
 sw/source/ui/app/swdllimpl.hxx                               |   16 +--
 sw/source/ui/inc/titlepage.hxx                               |   16 +--
 sw/source/ui/misc/titlepage.cxx                              |   15 +--
 sw/source/ui/misc/titlepage.hrc                              |   17 ++-
 sw/source/ui/misc/titlepage.src                              |   16 +--
 test/user-template/registry/modifications.xcd                |    4 
 ucb/source/ucp/webdav/warnings_guard_ne_locks.h              |    3 
 unodevtools/source/skeletonmaker/ostringostreaminserter.hxx  |    2 
 unotools/Library_utl.mk                                      |    9 -
 unotools/Package_inc.mk                                      |    9 -
 vcl/Package_kde4moc.mk                                       |   15 +--
 vcl/inc/unx/gtk/gtkprn.hxx                                   |    6 -
 vcl/inc/vcl/fontcapabilities.hxx                             |   16 +--
 vcl/unx/gtk/gdi/gtkprintwrapper.cxx                          |    3 
 vcl/unx/gtk/gdi/salprn-gtk.cxx                               |    5 -
 vcl/unx/gtk/inc/gtkprintwrapper.hxx                          |    3 
 vcl/unx/gtk3/a11y/gtk3atkaction.cxx                          |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkbridge.cxx                          |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkcomponent.cxx                       |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkeditabletext.cxx                    |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkfactory.cxx                         |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkhypertext.cxx                       |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkimage.cxx                           |   15 +--
 vcl/unx/gtk3/a11y/gtk3atklistener.cxx                        |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkregistry.cxx                        |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkselection.cxx                       |   15 +--
 vcl/unx/gtk3/a11y/gtk3atktable.cxx                           |   15 +--
 vcl/unx/gtk3/a11y/gtk3atktext.cxx                            |   15 +--
 vcl/unx/gtk3/a11y/gtk3atktextattributes.cxx                  |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkutil.cxx                            |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkvalue.cxx                           |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkwindow.cxx                          |   15 +--
 vcl/unx/gtk3/a11y/gtk3atkwrapper.cxx                         |   15 +--
 vcl/unx/gtk3/app/gtk3gtkdata.cxx                             |   15 +--
 vcl/unx/gtk3/app/gtk3gtkinst.cxx                             |   15 +--
 vcl/unx/gtk3/app/gtk3gtksys.cxx                              |   15 +--
 vcl/unx/gtk3/gdi/gtk3gtkprintwrapper.cxx                     |    3 
 vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx                |   15 +--
 vcl/unx/gtk3/gdi/gtk3salprn-gtk.cxx                          |    3 
 vcl/unx/gtk3/inc/gtkprintwrapper.hxx                         |    3 
 vcl/unx/gtk3/window/gtk3gtkframe.cxx                         |   15 +--
 vcl/unx/gtk3/window/gtk3gtkobject.cxx                        |   15 +--
 vcl/unx/kde4/Makefile                                        |   16 +--
 vcl/unx/kde4/warning_guard_qhash.h                           |    4 
 wizards/Pyuno_commonwizards.mk                               |    4 
 wizards/Pyuno_fax.mk                                         |    4 
 writerfilter/Library_doctok.mk                               |    9 -
 writerfilter/Library_ooxml.mk                                |    9 -
 writerfilter/Library_resourcemodel.mk                        |    9 -
 writerfilter/Library_rtftok.mk                               |    9 -
 writerfilter/Library_writerfilter.mk                         |    9 -
 writerfilter/Library_writerfilter_uno.mk                     |    9 -
 writerfilter/Module_writerfilter.mk                          |    9 -
 283 files changed, 1369 insertions(+), 1336 deletions(-)

New commits:
commit 7c5a11df60e5d8707e03e61f586fcf9defe6b597
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 6 21:40:20 2011 +0000

    normalize Red Hat, Inc.

diff --git a/sc/JunitTest_sc_complex.mk b/sc/JunitTest_sc_complex.mk
index 225c44b..80e1930 100644
--- a/sc/JunitTest_sc_complex.mk
+++ b/sc/JunitTest_sc_complex.mk
@@ -1,30 +1,29 @@
-##
-## 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 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.
-##
-## Major Contributor(s):
-## [ Copyright (C) 2011 Stephan Bergmann <sbergman at redhat.com> (initial
-##   developer) ]
-##
-## 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
-## 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.
-##
+# -*- 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 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman at redhat.com>
+#  (initial developer)
+#
+# 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
+# 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_JunitTest_JunitTest,sc_complex,SRCDIR))
 
@@ -58,3 +57,5 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sc_complex, \
 $(eval $(call gb_JunitTest_set_defs,sc_complex, \
     $$(DEFS) \
 ))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/JunitTest_sc_unoapi.mk b/sc/JunitTest_sc_unoapi.mk
index 7b31eca..fb2efdd 100644
--- a/sc/JunitTest_sc_unoapi.mk
+++ b/sc/JunitTest_sc_unoapi.mk
@@ -1,30 +1,29 @@
-##
-## 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 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.
-##
-## Major Contributor(s):
-## [ Copyright (C) 2011 Stephan Bergmann <sbergman at redhat.com> (initial
-##   developer) ]
-##
-## 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
-## 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.
-##
+# -*- 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 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman at redhat.com>
+#  (initial developer)
+#
+# 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
+# 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_JunitTest_JunitTest,sc_unoapi,SRCDIR))
 
@@ -46,3 +45,5 @@ $(eval $(call gb_JunitTest_set_defs,sc_unoapi,\
     -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sc/qa/unoapi/testdocuments \
     -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sc/qa/unoapi/knownissues.xcl \
 ))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 969978a..5e908d9 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -4,22 +4,22 @@
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may 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 at redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+ *  (initial developer)
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com>
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm at redhat.com>
- *   Markus Mohrhard <markus.mohrhard at googlemail.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/sc/qa/unit/filters-test.cxx b/sc/qa/unit/filters-test.cxx
index 626b038..2326c73 100644
--- a/sc/qa/unit/filters-test.cxx
+++ b/sc/qa/unit/filters-test.cxx
@@ -4,21 +4,22 @@
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may 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 at redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+ *  (initial developer)
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com>
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm at 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/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 4a67486..9916584 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -4,21 +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 at redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+ *  (initial developer)
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm at 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/qa/core/filters-test.cxx b/sw/qa/core/filters-test.cxx
index c8e7d07..0af2275 100644
--- a/sw/qa/core/filters-test.cxx
+++ b/sw/qa/core/filters-test.cxx
@@ -4,21 +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 at 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 at redhat.com>
+ *  (initial developer)
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm at 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/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index bac6ac9..b0f66b9 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -4,22 +4,22 @@
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may 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 at redhat.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+ *  (initial developer)
+ * Copyright (C) 2011 Markus Mohrhard <markus.mohrhard at googlemail.com>
  *
- * Contributor(s):
- *   Caolán McNamara <caolanm at redhat.com>
- *   Markus Mohrhard <markus.mohrhard at googlemail.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/test/user-template/registry/modifications.xcd b/test/user-template/registry/modifications.xcd
index 80ab50a..d323645 100644
--- a/test/user-template/registry/modifications.xcd
+++ b/test/user-template/registry/modifications.xcd
@@ -13,8 +13,8 @@
  * License.
  *
  * Major Contributor(s):
- * [ Copyright (C) 2011 Stephan Bergmann <sbergman at redhat.com> (initial
- *   developer) ]
+ * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman at redhat.com>
+ *  (initial developer)
  *
  * All Rights Reserved.
  *
commit c8ef924060b1f5d5e26b62645d9c0f24f7ce662b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Dec 6 21:15:10 2011 +0000

    normalize Red Hat, Inc. spellings, and bump to latest template

diff --git a/automation/AllLangResTarget_tma.mk b/automation/AllLangResTarget_tma.mk
index 6cb59f3..5181cae 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Executable_miniapp.mk b/automation/Executable_miniapp.mk
index bb0e2b7..3c4d856 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Executable_testtool.mk b/automation/Executable_testtool.mk
index 0aa986e..37a8376 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Library_communi.mk b/automation/Library_communi.mk
index 0692db1..a3b9534 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Library_simplecm.mk b/automation/Library_simplecm.mk
index 3ac6c37..9f85934 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Library_sts.mk b/automation/Library_sts.mk
index 80e7b7b..b680ea5 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Module_automation.mk b/automation/Module_automation.mk
index 5a30f9b..019a410 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Package_hid.mk b/automation/Package_hid.mk
index fff48d1..e9e4d7b 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Package_inc.mk b/automation/Package_inc.mk
index cf02c11..835dc96 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Package_packimages.mk b/automation/Package_packimages.mk
index 1299cb8..a818810 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/Package_testtool.mk b/automation/Package_testtool.mk
index ea88754..e85ee1b 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/inc/automation/communidllapi.h b/automation/inc/automation/communidllapi.h
index 637d00d..7bec94a 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 at redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+ *  (initial developer)
  *
  * All Rights Reserved.
  *
diff --git a/automation/inc/automation/simplecmdllapi.h b/automation/inc/automation/simplecmdllapi.h
index 08c262a..2963ebb 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 at redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+ *  (initial developer)
  *
  * All Rights Reserved.
  *
diff --git a/automation/inc/automation/stsdllapi.h b/automation/inc/automation/stsdllapi.h
index e7c3c64..56f4e48 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 at redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+ *  (initial developer)
  *
  * All Rights Reserved.
  *
diff --git a/automation/packimages/Makefile b/automation/packimages/Makefile
index a26f117..481d526 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/automation/source/testtool/Makefile b/automation/source/testtool/Makefile
index 9b1e007..c07c6c8 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at 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 7215764..420f6a0 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 at 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 at 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 600196c..c1ca220 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 at 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 at 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 f34174f..fbfbcb7 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 at 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 at 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 d5e6f53..9781e9b 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 at 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 at 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 2405fb3..b67f908 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 at 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 at 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 ea34774..de52de2 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 at 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 at 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 d978708..12806df 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 at 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 at 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 f35f553..8797a8b 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 at 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 at 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 7278126..9b4fe1b 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 at 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 at redhat.com>
+ *  (initial developer)
  *
- * Contributor(s): Caolán McNamara <caolanm at 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 c18cc69..c333ecf 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 at 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 at redhat.com>
+ *  (initial developer)
  *
- * Contributor(s): Caolán McNamara <caolanm at 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 c5a5a72..1f5f2c3 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 at 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 at redhat.com>
+ *  (initial developer)
  *
- * Contributor(s): Caolán McNamara <caolanm at 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 5784412..bbe5492 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 at 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 at 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 b9bea33..fa6df22 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 at 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 at 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 8b7117b..7a06b1e 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 at 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 at 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 cc7325f..d3203e2 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 at 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 at 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 092dfc7..8dc4beb 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 at 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 at 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 2eb73d5..dcb6aa1 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 at 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 at 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 73cb409..15b6806 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 at 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 at 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 3cd4132..dd38e99 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 at 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 at 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 6910ffd..4def9b3 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 at 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 at 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 d9c714b..2f55466 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 at 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 at 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 c8ac7c8..4a93a97 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 at 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 at 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 a0fb88e..c7535a9 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 at 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 at 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 4c99751..f635bbc 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 at 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 at 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 c537d2d..b0deeea 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 at 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 at 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 165f398..23d5f5b 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 at 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 at 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 9dd8fc8..de3c3cf 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 at 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 at 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 f66af97..cf06bb1 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 at 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 at 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 1ccd45e..3bdf867 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk
index 997ee42..d9e82cc 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk
index 3e3cb18..5dd7f04 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 104880a..1db3483 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index 956d3d6..d48518a 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 1706f3a..d18cfcc 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index e762f19..470497d 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 979702a..1d6ff38 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index c30914c..47dc397 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index f2a27d2..87de0eb 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 34d8f0a..d698df2 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index defd4f2..a7b69e5 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index cc5796a..e5d5e18 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index ac6e708..115ecb7 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index f2753dc..3a87a31 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index 02aa213..04624d6 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index 90074f3..bdb6342 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index 68687d1..759a4e9 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index c7c3809..9eb961b 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index b5ef6a7..9e4a490 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 0c48611..91561c8 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_deploymentgui.mk b/desktop/Library_deploymentgui.mk
index 02f4a23..28b9b4a 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk
index 5d1e9ff..fc1a175 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 7ec41e8..6bdf926 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 30277d0..a500677 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index f79f50b..c60db25 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk
index abc63bf..3db7a47 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_spl.mk b/desktop/Library_spl.mk
index cf170ce..da9dc48 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_spl_unx.mk b/desktop/Library_spl_unx.mk
index e6b3aab..e549a3e 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Library_unopkgapp.mk b/desktop/Library_unopkgapp.mk
index 3f78924..f2233ec 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 5c1d523..8439d38 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index 9e00e23..bd2f36f 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Package_intro.mk b/desktop/Package_intro.mk
index b54c90b..7ffa909 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index e0e7d35..d2afeda 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Pagein.mk b/desktop/Pagein.mk
index 616b9cc..d1b370c 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Pagein_calc.mk b/desktop/Pagein_calc.mk
index 64c2bf9..a14668d 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index 3b0330c..85a7d18 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Pagein_draw.mk b/desktop/Pagein_draw.mk
index d3cc26a..1808db4 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Pagein_impress.mk b/desktop/Pagein_impress.mk
index 96043f2..4d286e1 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Pagein_writer.mk b/desktop/Pagein_writer.mk
index ccd2467..935cb2d 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk
index 57e6358..04dffbf 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index fe519bf..8472601 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index bd710ea..8470b2d 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index b96a420..e208b32 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index a0a5a38..7d4778f 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index ac6ae36..f00da3a 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index 5441a28..aa404c3 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 424390f..0c5cafd 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index 71e5184..59561f6 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Zip_brand.mk b/desktop/Zip_brand.mk
index 4e89c77..03ba5ec 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Zip_brand_dev.mk b/desktop/Zip_brand_dev.mk
index 9a7a9ea..4ab1931 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/Zip_shell.mk b/desktop/Zip_shell.mk
index df11bb1..08c6b81 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/branding/Makefile b/desktop/branding/Makefile
index cdd37ab..7b062a3 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 at redhat.com> (initial developer)
+# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
 #
 # All Rights Reserved.
 #
diff --git a/desktop/source/inc/desktopdllapi.h b/desktop/source/inc/desktopdllapi.h
index a97f4d4..dcb8dbc 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 at redhat.com> (initial developer)
+ * Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+ *  (initial developer)
  *
  * All Rights Reserved.
  *
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 1e3b738..7b88414 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 at 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 at 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 95f6cc2..0e8d8f0 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 at 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 at 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 4066f6d..246a91f 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 at 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 at 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 8badcbe..d25f74d 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 at 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 at 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 6732748..cf44b2d 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 664cf2c..1ea8b34 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 at redhat.com>
+#  (initial developer)
 #
-# Major Contributor(s): 
-#  David Tardon <dtardon at 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 8514f09..3b4c285 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 at redhat.com>
+#  (initial developer)
 #
-# Major Contributor(s): 
-#  David Tardon <dtardon at 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 d8a232d..12849a3 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 at 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 at 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 92bcad8..226d002 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 at 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 at 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 baff97f..6c4ff89 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 at 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 at 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 3eb792f..0830623 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 at 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 at 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 a099191..71d3e13 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 at 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 at 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 6b7d01a..4a70c43 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 at 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 at 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 3e38da6..c46bd92 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 at 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 at 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 d5f58ea..55a03c4 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 at 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 at 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 11300cd..5cb8434 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 at 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 at 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 41d82a0..48eb28c 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 40e8c73..49a7c80 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 at 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 at 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 95390e5..461c017 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 at 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 at 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 cbd3aa0..18b6ebf 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 at 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 at redhat.com>
+ *  (initial developer)
  *
- * Contributor(s): Caolán McNamara <caolanm at 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 362ca4d..88010ae 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 255d917..af1e4b1 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk

... etc. - the rest is truncated

• Previous message: [Libreoffice-commits] .: vcl/source
• Next message: [Libreoffice-commits] .: binfilter/qa
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]