Authored by vkrause.

Description

SVN_MERGE

Merged revisions 1015513,1015663-1015664,1015670 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

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

r1015513 | winterz | 2009-08-25 20:05:37 +0200 (Tue, 25 Aug 2009) | 4 lines

fix some compile warnings for cases not handled in switches
MERGE: none
DO_NOT_BACKPORT: new i18n strings

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

r1015663 | tmcguire | 2009-08-26 09:41:50 +0200 (Wed, 26 Aug 2009) | 20 lines

SVN_MERGE
SVN_SILENT
Recorded merge of revisions 1015161 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

................
  r1015161 | winterz | 2009-08-24 19:46:44 +0200 (Mon, 24 Aug 2009) | 11 lines
  
  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
  ........
................

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

r1015664 | tmcguire | 2009-08-26 09:43:48 +0200 (Wed, 26 Aug 2009) | 22 lines

SVN_SILENT
SVN_MERGE
Recorded merge of revisions 1015463 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs

................
  r1015463 | winterz | 2009-08-25 17:00:01 +0200 (Tue, 25 Aug 2009) | 13 lines
  
  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
  ........
................

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

r1015670 | vkrause | 2009-08-26 10:05:21 +0200 (Wed, 26 Aug 2009) | 3 lines

Flush the pending notification queue instead of asserting, when
disabling change recording.

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

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

Details

Committed
vkrauseAug 26 2009, 12:19 PM
Parents
R41:1dfb7aa8ed6e: SVN_MERGE
Branches
Unknown
Tags
Unknown