summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/conflictdialog.cpp
Commit message (Expand)AuthorAgeFilesLines
* rename the following methods:tpearson2011-08-101-2/+2
* Initial conversion of kdepim to TQttpearson2011-04-131-2/+2
* Trinity Qt initial conversiontpearson2010-07-311-2/+2
* Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.toma2009-11-251-0/+26