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 | e9de8ab5157c6702db4835c98e9c8a56f93d15c3 (patch) | |
| tree | bccb54dd52d07b6043d8cde9057de9725680e943 /wizards/source/formwizard | |
| parent | 1816f3232b325c81b4d843925476a9cc1f089041 (diff) | |
| parent | 60c0e59fd450e39902d85918d2243fb83c02a21d (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 'wizards/source/formwizard')
| -rw-r--r-- | wizards/source/formwizard/dbwizres.src | 5 | ||||
| -rw-r--r-- | wizards/source/formwizard/makefile.mk | 6 |
2 files changed, 2 insertions, 9 deletions
diff --git a/wizards/source/formwizard/dbwizres.src b/wizards/source/formwizard/dbwizres.src index d3b04cd8593d..065008c40cec 100644 --- a/wizards/source/formwizard/dbwizres.src +++ b/wizards/source/formwizard/dbwizres.src @@ -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: dbwizres.src,v $ - * $Revision: 1.80 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify diff --git a/wizards/source/formwizard/makefile.mk b/wizards/source/formwizard/makefile.mk index 25f4f947fdd8..3a5ec422625f 100644 --- a/wizards/source/formwizard/makefile.mk +++ b/wizards/source/formwizard/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.5 $ -# # This file is part of OpenOffice.org. # # OpenOffice.org is free software: you can redistribute it and/or modify |