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 | 1ec86b92249d382223f96f9c2bf7a5a0f06aaa1f (patch) | |
| tree | fc0cbf5ac3650ee8660a75653702efc24b2137b0 /testshl2/inc/testshl/cmdlinebits.hxx | |
| parent | 7f4fa441c9a3f04aeaf89be7aa5b5735b165de70 (diff) | |
| parent | 4de2643ea718f0c246a87667036dbadacdbc708d (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 'testshl2/inc/testshl/cmdlinebits.hxx')
| -rw-r--r-- | testshl2/inc/testshl/cmdlinebits.hxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/testshl2/inc/testshl/cmdlinebits.hxx b/testshl2/inc/testshl/cmdlinebits.hxx index 92f0e5c1c660..99c166f2fc83 100644 --- a/testshl2/inc/testshl/cmdlinebits.hxx +++ b/testshl2/inc/testshl/cmdlinebits.hxx @@ -2,13 +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$ - * $Revision$ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -16,7 +13,7 @@ * only, as published by the Free Software Foundation. * * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of + * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Lesser General Public License version 3 for more details * (a copy is included in the LICENSE file that accompanied this code). |