summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.h
Commit message (Expand)AuthorAgeFilesLines
* Rename old tq methods that no longer need a unique nameTimothy Pearson2011-12-181-2/+2
* Revert "Rename a number of old tq methods that are no longer tq specific"Timothy Pearson2011-12-161-2/+2
* Rename a number of old tq methods that are no longer tq specificTimothy Pearson2011-12-151-2/+2
* TQt4 port kdiff3tpearson2011-06-271-62/+65
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+454