summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.h
Commit message (Collapse)AuthorAgeFilesLines
* Remove spurious TQ_OBJECT instancesTimothy Pearson2012-02-171-3/+3
|
* 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
| | | | This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
* 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
| | | | | | | This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1238464 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+454
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da