summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.cpp
Commit message (Expand)AuthorAgeFilesLines
* Rename obsolete tq methods to standard namesTimothy Pearson2011-12-211-2/+2
* Remove additional unneeded tq method conversionsTimothy Pearson2011-12-191-13/+13
* Rename old tq methods that no longer need a unique nameTimothy Pearson2011-12-181-20/+20
* Revert "Rename a number of old tq methods that are no longer tq specific"Timothy Pearson2011-12-161-32/+32
* Rename a number of old tq methods that are no longer tq specificTimothy Pearson2011-12-151-32/+32
* rename the following methods:tpearson2011-08-101-4/+4
* Remove the tq in front of these incorrectly TQt4-converted methods/data members:tpearson2011-07-091-7/+7
* TQt4 port kdiff3tpearson2011-06-271-228/+228
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+3222