Revert my kleopatra merge and every commit after that. The problem is that this big merge breaks svn annotate. I'll run a script afterwards the re-merges all revisions, but commits them one-by-one.
This commit doesn't revert the svnmerge info, because there have
been other merges afterwards. The script will not use svnmerge, but
manually merge with svn diff.
Note that kdepim now will not compile, please don't touch it for now.
The commands used were:
svn diff libkleo -r823980:823979 | patch -p0
svn diff libkleo -r824561:824560 | patch -p0
svn diff libkleo -r823758:823757 | patch -p0
svn diff libkleo -r822833:822832 | patch -p0
svn diff libkleo -r822815:822814 | patch -p0
svn diff kleopatra -r824691:824690 | patch -p0
svn diff kleopatra -r823980:823979 | patch -p0
svn diff kleopatra -r822969:822968 | patch -p0
svn diff kleopatra -r822815:822814 | patch -p0
Sorry for the big mess, I hope I manage to clean everything up properly.
svn path=/trunk/KDE/kdepim/kleopatra/uiserver/; revision=827377