summaryrefslogtreecommitdiffstats
path: root/src/merger.h
Commit message (Collapse)AuthorAgeFilesLines
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+61
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da