summaryrefslogtreecommitdiffstats
path: root/kitchensync/src/singleconflictdialog.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Moved kpilot from kdepim to applications, as the core Trinity libraries ↵tpearson2011-02-161-7/+7
| | | | | | should not contain hardware-dependent software git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1221127 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Reverse OpenSync patch as it causes a build failure on Debiantpearson2010-09-081-11/+3
| | | | git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172771 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Part 2/2 of Chakra patch committpearson2010-09-071-3/+11
| | | | git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1172727 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Trinity Qt initial conversiontpearson2010-07-311-15/+15
| | | | git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1157655 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
* Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.toma2009-11-251-0/+123
BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da