diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-10 14:55:27 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-10 14:55:27 +0000 |
| commit | ae7a959a0e933ec47efc3ba842e0af4292ab98e0 (patch) | |
| tree | 6a53451f3f8e0e764fb54825e74869a454fc5ca4 /filter/source/config/tools/merge | |
| parent | 1479d413793710c7613b0813470dc0d35e7afa53 (diff) | |
INTEGRATION: CWS fwk02ea (1.4.12); FILE MERGED
2004/06/10 07:24:03 as 1.4.12.1: remove UTF-8 problematic signs
Diffstat (limited to 'filter/source/config/tools/merge')
| -rw-r--r-- | filter/source/config/tools/merge/Merger.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/filter/source/config/tools/merge/Merger.java b/filter/source/config/tools/merge/Merger.java index 4124d49b0ca9..8654458f2f08 100644 --- a/filter/source/config/tools/merge/Merger.java +++ b/filter/source/config/tools/merge/Merger.java @@ -2,9 +2,9 @@ * * $RCSfile: Merger.java,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: svesik $ $Date: 2004-04-21 12:00:07 $ + * last change: $Author: kz $ $Date: 2004-06-10 15:55:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,7 +71,7 @@ import com.sun.star.filter.config.tools.utils.*; /** can merge different xml fragments together. * - * @author Andreas Schlüns + * */ public class Merger { |