summaryrefslogtreecommitdiffstats
path: root/kioslave/svn/icons/cr32-action-svn_merge.png
Commit message (Collapse)AuthorAgeFilesLines
* Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.toma2009-11-251-0/+0
BUG:215923 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da