HomePhorge

SVN_MERGE
f6d75efcb604Unpublished

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE

Merged revisions 1013497,1013737,1013746,1013753,1013759,1013809 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

........

r1013497 | vkrause | 2009-08-20 10:13:29 +0200 (Thu, 20 Aug 2009) | 5 lines

unknown/non-standard headers are perfectly fine in normal mails, so
don't spam me about that

SVN_SILENT

........

r1013737 | winterz | 2009-08-20 18:41:45 +0200 (Thu, 20 Aug 2009) | 6 lines

all of the overloaded insertPlainSignatureIntoTextEdit's arguments are required now.
so we don't get compile errors due to ambiguous overloads.

another option would be to rename the overloaded method, but this seems easier.
CCMAIL: mcguire@kde.org

........

r1013746 | winterz | 2009-08-20 19:32:12 +0200 (Thu, 20 Aug 2009) | 3 lines

remove extra header for the "Attached documents" in an invitation.
not sure how this got left behind.

........

r1013753 | winterz | 2009-08-20 19:45:28 +0200 (Thu, 20 Aug 2009) | 7 lines

merge SVN commit 1013751 from e4 kdepimlibs to trunk

make sure to convert Attachment labels from Utf8

Sorry Thomas, you'll need to record this for us.
MERGE: 4.3

........

r1013759 | winterz | 2009-08-20 19:53:18 +0200 (Thu, 20 Aug 2009) | 8 lines

merge SVN commit 1013756 by winterz from e4/kdepimlibs to trunk.

remove hack when printing the invitation attachment name and converting from Utf8.
as this work is now done properly in the icalformat API.

Thomas: again you'll need to record this
MERGE: 4.3

........

r1013809 | winterz | 2009-08-20 21:42:57 +0200 (Thu, 20 Aug 2009) | 4 lines

don't crash if the calendar passed to the FreeBusy is zero.
BUG: 186597
MERGE: 4.3

........

svn path=/branches/work/akonadi-ports/kdepimlibs/; revision=1013914

Event Timeline

Volker Krause <vkrause@kde.org> committed rKPLf6d75efcb604: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).Aug 21 2009, 9:57 AM