[Libreoffice-commits] .: 2 commits - xmerge/source

[Caolán McNamara]

 xmerge/source/bridge/build.xml                                                 |    3 ---
 xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java |    2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit d9fb37f9067526274c5f5de5091d8d86a6b74f65
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 22 09:38:38 2010 +0000

    drop unneccessary verbosity

diff --git a/xmerge/source/bridge/build.xml b/xmerge/source/bridge/build.xml
index d07e55c..11f4b70 100644
--- a/xmerge/source/bridge/build.xml
+++ b/xmerge/source/bridge/build.xml
@@ -43,9 +43,6 @@
 
     <target name="init" >
         <mkdir dir="${target.dir}"/>
-        <echo message="--------------------------------------------------------------------------------" />
-        <echo message="debug is ${debug}"/>
-        <echo message="--------------------------------------------------------------------------------" />
     </target>
 
     <!-- compile java sources in ${package} -->
commit 566e2cd4b8d006c3e7371fc50ba03e60490fd42c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 22 09:26:35 2010 +0000

    WaE: fix typo

diff --git a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
index 1fcc6c6..c5e9d4e 100644
--- a/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
+++ b/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
@@ -47,6 +47,6 @@ public interface NodeMergeAlgorithm {
      *  @param  modifyNode    The <code>Node</code> to be merged.  It may
      *                        be modified.
      */
-    public void merge(Node orginalNode, Node modifyNode);
+    public void merge(Node originalNode, Node modifyNode);
 }