summaryrefslogtreecommitdiffstats
path: root/src/mergeresultwindow.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Rename additional header files to avoid conflicts with KDE4Timothy Pearson2013-02-151-2/+2
|
* 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
| | | | This reverts commit f3372e7bea9bbc288e039d85d660450220a637d8.
* 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
| | | | | | | | | tqfind find tqreplace replace tqcontains contains git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Remove the tq in front of these incorrectly TQt4-converted methods/data members:tpearson2011-07-091-7/+7
| | | | | | | | | | | | tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* TQt4 port kdiff3tpearson2011-06-271-228/+228
| | | | | | | 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/+3222
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da