diff options
author | sb <sb@openoffice.org> | 2010-02-25 13:53:42 +0100 |
---|---|---|
committer | sb <sb@openoffice.org> | 2010-02-25 13:53:42 +0100 |
commit | 5bdd72d815955fc602fe7494c03a61650f2bd0ce (patch) | |
tree | 50956886eb937d401291b01853470a43c74d098a /configmgr/inc | |
parent | 83fd69ccc3e235f494b9dc08bd246e591f76d7cc (diff) | |
parent | 4d8175599b8d193aba6eef89ef905c830b87d7e7 (diff) |
sb111: merged in DEV300_m72
Diffstat (limited to 'configmgr/inc')
-rw-r--r-- | configmgr/inc/makefile.mk | 6 | ||||
-rw-r--r-- | configmgr/inc/pch/precompiled_configmgr.cxx | 8 | ||||
-rw-r--r-- | configmgr/inc/pch/precompiled_configmgr.hxx | 8 |
3 files changed, 7 insertions, 15 deletions
diff --git a/configmgr/inc/makefile.mk b/configmgr/inc/makefile.mk index 5ade6c235f14..3dd2fc4d4811 100644 --- a/configmgr/inc/makefile.mk +++ b/configmgr/inc/makefile.mk @@ -1,14 +1,10 @@ #************************************************************************* # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile,v $ -# -# $Revision: 1.4 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/configmgr/inc/pch/precompiled_configmgr.cxx b/configmgr/inc/pch/precompiled_configmgr.cxx index edc693d742f7..abfb44ccb7a3 100644 --- a/configmgr/inc/pch/precompiled_configmgr.cxx +++ b/configmgr/inc/pch/precompiled_configmgr.cxx @@ -1,14 +1,11 @@ /************************************************************************* +* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * -* Copyright 2009 by Sun Microsystems, Inc. +* Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: code,v $ -* -* $Revision: 1.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -25,6 +22,7 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. +* ************************************************************************/ #include "precompiled_configmgr.hxx" diff --git a/configmgr/inc/pch/precompiled_configmgr.hxx b/configmgr/inc/pch/precompiled_configmgr.hxx index c56afda783a9..7561fe89f7c4 100644 --- a/configmgr/inc/pch/precompiled_configmgr.hxx +++ b/configmgr/inc/pch/precompiled_configmgr.hxx @@ -1,14 +1,11 @@ /************************************************************************* +* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * -* Copyright 2009 by Sun Microsystems, Inc. +* Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * -* $RCSfile: code,v $ -* -* $Revision: 1.4 $ -* * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -25,6 +22,7 @@ * version 3 along with OpenOffice.org. If not, see * <http://www.openoffice.org/license.html> * for a copy of the LGPLv3 License. +* ************************************************************************/ #if defined PRECOMPILED_HEADERS |