diff options
author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
---|---|---|
committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
commit | db5a0cd99b1ebc5679445238a891fda7c5abfb5e (patch) | |
tree | 039fd11869b2c068694f91f33654ce0abb133c25 /tools/os2 | |
parent | 4107ff94b0446bca97e03dfbcc4db3654b9b9118 (diff) | |
parent | f696d8ce6bbcc8cded7b075049a8c163c20c3782 (diff) |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'tools/os2')
-rw-r--r-- | tools/os2/inc/dll.hxx | 6 | ||||
-rw-r--r-- | tools/os2/source/dll/makefile.mk | 6 | ||||
-rw-r--r-- | tools/os2/source/dll/toolsdll.cxx | 6 |
3 files changed, 3 insertions, 15 deletions
diff --git a/tools/os2/inc/dll.hxx b/tools/os2/inc/dll.hxx index 1f8858e89d63..81a87a03ece7 100644 --- a/tools/os2/inc/dll.hxx +++ b/tools/os2/inc/dll.hxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dll.hxx,v $ - * - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/tools/os2/source/dll/makefile.mk b/tools/os2/source/dll/makefile.mk index 78d4a729c234..97cff795defb 100644 --- a/tools/os2/source/dll/makefile.mk +++ b/tools/os2/source/dll/makefile.mk @@ -2,14 +2,10 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2008 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # -# $RCSfile: makefile.mk,v $ -# -# $Revision: 1.3 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/tools/os2/source/dll/toolsdll.cxx b/tools/os2/source/dll/toolsdll.cxx index 4c8650a2737c..0e0bdec3a9b0 100644 --- a/tools/os2/source/dll/toolsdll.cxx +++ b/tools/os2/source/dll/toolsdll.cxx @@ -2,14 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: toolsdll.cxx,v $ - * - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |