summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/merger/NodeMergeAlgorithm.java
AgeCommit message (Expand)AuthorFilesLines
2012-09-26fdo#51304: Remove @author annotationJosé Guilherme Vanz1-2/+0
2012-06-29re-base on ALv2 code.Michael Meeks1-26/+17
2010-12-22WaE: fix typoCaolán McNamara1-1/+1
2010-11-01Fix javadoc warnings in filters/xmerge - mergerNigel Hawkins1-1/+1
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun Mi...Jens-Heiner Rechtien1-4/+1
2009-03-16CWS-TOOLING: integrate CWS xmergecleanVladimir Glazounov1-3/+0
2008-04-10INTEGRATION: CWS changefileheader (1.3.36); FILE MERGEDRüdiger Timm1-23/+18
2006-08-01INTEGRATION: CWS pj57 (1.2.24); FILE MERGEDIvo Hinkelmann1-42/+22
2005-10-24INTEGRATION: CWS lo8 (1.1.2); FILE ADDEDJens-Heiner Rechtien1-0/+83