summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.h
Commit message (Expand)AuthorAgeFilesLines
* TQt4 port kdiff3tpearson2011-06-271-62/+65
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+454