summaryrefslogtreecommitdiff
path: root/xmerge/source/xmerge/java/org/openoffice/xmerge/MergeException.java
AgeCommit message (Expand)AuthorFilesLines
2014-09-04xmerge: javadoc maintenance and minor code formattingrbuj1-6/+4
2012-06-21re-base on ALv2 code.Michael Meeks1-26/+17
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun Mi...Jens-Heiner Rechtien1-4/+1
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/+73