diff options
author | Henning Brinkmann <hbrinkm@openoffice.org> | 2010-03-23 17:33:11 +0100 |
---|---|---|
committer | Henning Brinkmann <hbrinkm@openoffice.org> | 2010-03-23 17:33:11 +0100 |
commit | 624950197e7855310eab450bcd78949a627ab1aa (patch) | |
tree | db9f137528845a6f2dff392955c9953c4edbc801 /xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java | |
parent | ac4652bea1be54b565d1e648157b4007795ad3bb (diff) | |
parent | 47d83021c1fb1fb51cb268f7549d9d0f92531e66 (diff) |
writerfilter07: merged DEV300_m75
Diffstat (limited to 'xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java')
-rw-r--r-- | xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java index 21b9c08719b3..1511d9827081 100644 --- a/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java +++ b/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java @@ -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: NodeMergeAlgorithm.java,v $ - * $Revision: 1.3 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify |