diff options
Diffstat (limited to 'sal')
-rw-r--r-- | sal/inc/internal/rtllifecycle.h | 4 | ||||
-rw-r--r-- | sal/inc/sal/detail/log.h | 4 | ||||
-rw-r--r-- | sal/inc/sal/log.hxx | 4 | ||||
-rw-r--r-- | sal/osl/all/log.cxx | 4 | ||||
-rw-r--r-- | sal/osl/all/logformat.hxx | 4 | ||||
-rw-r--r-- | sal/osl/all/trace.cxx | 4 | ||||
-rw-r--r-- | sal/osl/unx/createfilehandlefromfd.hxx | 4 | ||||
-rw-r--r-- | sal/qa/cppunit_local.mk | 16 | ||||
-rw-r--r-- | sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx | 4 | ||||
-rw-r--r-- | sal/util/sal_textenc/makefile.mk | 2 | ||||
-rw-r--r-- | sal/util/sal_textenc/saltextenc.map | 4 | ||||
-rw-r--r-- | sal/workben/measure_oustrings.cxx | 14 |
12 files changed, 36 insertions, 32 deletions
diff --git a/sal/inc/internal/rtllifecycle.h b/sal/inc/internal/rtllifecycle.h index 6e5ea81f97fd..31ccb47a576b 100644 --- a/sal/inc/internal/rtllifecycle.h +++ b/sal/inc/internal/rtllifecycle.h @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/inc/sal/detail/log.h b/sal/inc/sal/detail/log.h index bc51b89b6b14..8fc5776ce71e 100644 --- a/sal/inc/sal/detail/log.h +++ b/sal/inc/sal/detail/log.h @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/inc/sal/log.hxx b/sal/inc/sal/log.hxx index 2e09c29e5aa9..93b00fd6b787 100644 --- a/sal/inc/sal/log.hxx +++ b/sal/inc/sal/log.hxx @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/osl/all/log.cxx b/sal/osl/all/log.cxx index 6d8dee96c8a1..6d7d40bdd8fd 100644 --- a/sal/osl/all/log.cxx +++ b/sal/osl/all/log.cxx @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/osl/all/logformat.hxx b/sal/osl/all/logformat.hxx index bb6ea4cc6bdd..bb24f01180e3 100644 --- a/sal/osl/all/logformat.hxx +++ b/sal/osl/all/logformat.hxx @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/osl/all/trace.cxx b/sal/osl/all/trace.cxx index e0893d024fbf..2d96b7d645e5 100644 --- a/sal/osl/all/trace.cxx +++ b/sal/osl/all/trace.cxx @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/osl/unx/createfilehandlefromfd.hxx b/sal/osl/unx/createfilehandlefromfd.hxx index 116c074a2ce1..c32f99bf2ec7 100644 --- a/sal/osl/unx/createfilehandlefromfd.hxx +++ b/sal/osl/unx/createfilehandlefromfd.hxx @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/qa/cppunit_local.mk b/sal/qa/cppunit_local.mk index eaa662877b84..ec35604f4fa5 100644 --- a/sal/qa/cppunit_local.mk +++ b/sal/qa/cppunit_local.mk @@ -1,21 +1,23 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- # Version: MPL 1.1 / GPLv3+ / LGPLv3+ # # The contents of this file are subject to the Mozilla Public License Version # 1.1 (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.mozilla.org/MPL/ +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS IS" basis, # WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License # for the specific language governing rights and limitations under the # License. # -# The Initial Developer of the Original Code is -# Red Hat, Inc. -# Portions created by the Initial Developer are Copyright (C) 2011 the -# Initial Developer. All Rights Reserved. +# Major Contributor(s): +# Copyright (C) 2011 Red Hat, Inc., David Tardon <dtardon@redhat.com> +# (initial developer) # -# Contributor(s): David Tardon <dtardon@redhat.com> +# All Rights Reserved. +# +# For minor contributions see the git repository. # # Alternatively, the contents of this file may be used under the terms of # either the GNU General Public License Version 3 or later (the "GPLv3+"), or diff --git a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx index b0234f92d518..372bd4ebe013 100644 --- a/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx +++ b/sal/qa/rtl/oustringbuffer/test_oustringbuffer_appendchar.cxx @@ -13,8 +13,8 @@ * License. * * Major Contributor(s): - * [ Copyright (C) 2011 Stephan Bergmann, Red Hat <sbergman@redhat.com> (initial - * developer) ] + * Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> + * (initial developer) * * All Rights Reserved. * diff --git a/sal/util/sal_textenc/makefile.mk b/sal/util/sal_textenc/makefile.mk index 96a054098450..ec133ee98a2c 100644 --- a/sal/util/sal_textenc/makefile.mk +++ b/sal/util/sal_textenc/makefile.mk @@ -11,7 +11,7 @@ # License. # # Major Contributor(s): -# [ Copyright (C) 2011 Stephan Bergmann, Red Hat Inc. <sbergman@redhat.com> +# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> # (initial developer) ] # # All Rights Reserved. diff --git a/sal/util/sal_textenc/saltextenc.map b/sal/util/sal_textenc/saltextenc.map index a740f4c91b5b..86401fe47e88 100644 --- a/sal/util/sal_textenc/saltextenc.map +++ b/sal/util/sal_textenc/saltextenc.map @@ -11,8 +11,8 @@ # License. # # Major Contributor(s): -# Copyright (C) 2011 Stephan Bergmann, Red Hat Inc. <sbergman@redhat.com> -# (initial developer) +# Copyright (C) 2011 Red Hat, Inc., Stephan Bergmann <sbergman@redhat.com> +# (initial developer) # # All Rights Reserved. # diff --git a/sal/workben/measure_oustrings.cxx b/sal/workben/measure_oustrings.cxx index eff82c814d0f..480f178523a1 100644 --- a/sal/workben/measure_oustrings.cxx +++ b/sal/workben/measure_oustrings.cxx @@ -4,20 +4,21 @@ * * The contents of this file are subject to the Mozilla Public License Version * 1.1 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ * * Software distributed under the License is distributed on an "AS IS" basis, * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License * for the specific language governing rights and limitations under the * License. * - * The Initial Developer of the Original Code is - * [ Caolán McNamara <caolanm:redhat.com> ] - * Portions created by Caolán McNamara are Copyright (C) 2010 * Red Hat, Inc. + * Major Contributor(s): + * Copyright (C) 2010 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com> + * (initial developer) + * * All Rights Reserved. * - * Contributor(s): Caolán McNamara <caolanm@redhat.com> + * For minor contributions see the git repository. * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 3 or later (the "GPLv3+"), or @@ -25,6 +26,7 @@ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable * instead of those above. */ + #include <sal/main.h> #include <rtl/ustring.hxx> #include <osl/time.h> |