summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.h
Commit message (Collapse)AuthorAgeFilesLines
* Rename old tq methods that no longer need a unique nameTimothy Pearson2012-06-051-2/+2
| | | | (cherry picked from commit c7e29c4606e72cf1d3d0052eec08805c8cf3fce7)
* 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