summaryrefslogtreecommitdiffstats
path: root/kpilot/conduits/docconduit/doc-conflictdialog.h
Commit message (Expand)AuthorAgeFilesLines
* Moved kpilot from kdepim to applications, as the core Trinity libraries shoul...tpearson2011-02-161-83/+0
* TQt conversion fixestpearson2010-08-021-6/+6
* Trinity Qt initial conversiontpearson2010-07-311-9/+9
* Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.toma2009-11-251-0/+83