summaryrefslogtreecommitdiffstats
path: root/doc/en/merging.html
Commit message (Collapse)AuthorAgeFilesLines
* Additional k => tde renaming and fixesSlávek Banko2013-09-031-1/+1
|
* Update files and references in support of bug report 1446.Darrell Anderson2013-04-181-1/+1
|
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+195
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1088041 283d02a7-25f6-0310-bc7c-ecb5cbfe19da