Authored by vkrause.

Description

SVN_MERGE

Merged revisions 1015316,1015325-1015326,1015365,1015467 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

................

r1015316 | vkrause | 2009-08-25 11:32:32 +0200 (Tue, 25 Aug 2009) | 3 lines

Make a copy of the payload data, the temporary QByteArray is long gone
again when we use it otherwise.

................

r1015325 | cgiboudeaux | 2009-08-25 11:42:30 +0200 (Tue, 25 Aug 2009) | 1 line

The akonadi protocol version was updated. We now require akonadi 1.2.61.

................

r1015326 | cgiboudeaux | 2009-08-25 11:43:09 +0200 (Tue, 25 Aug 2009) | 1 line

Bump version.

................

r1015365 | winterz | 2009-08-25 13:20:13 +0200 (Tue, 25 Aug 2009) | 15 lines

merge SVN commit 1015161 by winterz:
Thomas, please record this.
CCMAIL: thomas@kdab.net
.........
Merged revisions 1015158 via svnmerge from 
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1015158 | winterz | 2009-08-24 13:36:11 -0400 (Mon, 24 Aug 2009) | 4 lines
  
  use long date formats in the event viewer and in the tooltips
  fixes kolab/issue3815
  MERGE: e4,trunk,4.3
........

................

r1015467 | winterz | 2009-08-25 17:02:57 +0200 (Tue, 25 Aug 2009) | 17 lines

merge SVN commit 1015463 by winterz from e4 to trunk:
Thomas, please record this
CCMAIL: thomas@kdab.net

Merged revisions 1015459 via svnmerge from 
https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r1015459 | winterz | 2009-08-25 10:47:30 -0400 (Tue, 25 Aug 2009) | 6 lines
  
  add colons to the event viewer headers ("Date","Time","Location","Organizer","Attendees")
  fixed kolab/issue3816
  
  MERGE: e4,trunk
  DO_NOT_BACKPORT: 4.3
........

................

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

Details

Committed
vkrauseAug 25 2009, 4:00 PM
Parents
R41:05108257a7ef: SVN_MERGE
Branches
Unknown
Tags
Unknown