summaryrefslogtreecommitdiffstats
path: root/konqueror/keditbookmarks/kbookmarkmerger.cpp
Commit message (Expand)AuthorAgeFilesLines
* Rename KInstance and KAboutData to avoid conflicts with KDE4Timothy Pearson2013-01-221-2/+2
* Rename KApplication to TDEApplication to avoid conflicts with KDE4Timothy Pearson2013-01-201-2/+2
* Rename KCmdLineArgs to TDECmdLineArgs to avoid conflicts with KDE4Timothy Pearson2013-01-191-3/+3
* rename the following methods:tpearson2011-08-101-1/+1
* Enable compilation with TQt for Qt4 3.4.0 TP2tpearson2011-01-191-1/+1
* 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/+138