summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/multiconflictdialog.cpp
Commit message (Expand)AuthorAgeFilesLines
* Part 2/2 of Chakra patch committpearson2010-09-071-2/+4
* Trinity Qt initial conversiontpearson2010-07-311-16/+16
* Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.toma2009-11-251-0/+141