Merged revisions 1010391,1010446,1010676,1010683,1010699,1010805,1010807,1010813,1010815-1010817,1010994-1010995,1011486-1011487,1011522-1011526,1011716,1011838,1011953,1012109,1012151 via svnmerge from 
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepimlibs

................
  r1010391 | cgiboudeaux | 2009-08-12 13:21:32 +0200 (Wed, 12 Aug 2009) | 1 line
  
  There's no libkdepim in kdepimlibs
................
  r1010446 | vkrause | 2009-08-12 15:56:47 +0200 (Wed, 12 Aug 2009) | 2 lines
  
  Fix incomplete CollectionFetchScope copy ctor.
................
  r1010676 | vkrause | 2009-08-13 10:12:40 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Fix the test, the root collection has no remote id.
................
  r1010683 | vkrause | 2009-08-13 10:37:35 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Fix full sync for resources using hierarchical RIDs.
................
  r1010699 | vkrause | 2009-08-13 11:05:08 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  add missing flag operator declaration
................
  r1010805 | tmcguire | 2009-08-13 15:42:17 +0200 (Thu, 13 Aug 2009) | 85 lines
  
  Block cyclic merge+block
  SVN_SILENT
  SVN_MERGE
  Blocked revisions 1007424,1008457 via svnmerge
  
  ................
    r1007424 | tmcguire | 2009-08-05 20:49:45 +0200 (Wed, 05 Aug 2009) | 62 lines
    
    Block those cyclic merges.
    SVN_SILENT
    Blocked revisions 1005102-1005103 via svnmerge
    
    ................
      r1005102 | tmcguire | 2009-07-31 12:41:10 +0200 (Fri, 31 Jul 2009) | 23 lines
      
      Backport r1004645 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1001119 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1001119 | winterz | 2009-07-22 18:05:16 +0200 (Wed, 22 Jul 2009) | 12 lines
        
        Merged revisions 1001092 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001092 | winterz | 2009-07-22 11:50:55 -0400 (Wed, 22 Jul 2009) | 5 lines
          
          more crash guards
          kolab/issue3769
          
          MERGE: e4,trunk,4.3
        ........
      ................
    ................
      r1005103 | tmcguire | 2009-07-31 12:42:02 +0200 (Fri, 31 Jul 2009) | 31 lines
      
      Backport r1004647 by tmcguire from trunk to the 4.3 branch:
      
      SVN_MERGE
      Merged revisions 1001354 via svnmerge from 
      svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
      
      ................
        r1001354 | winterz | 2009-07-23 01:47:36 +0200 (Thu, 23 Jul 2009) | 20 lines
        
        Merged revisions 1001350 via svnmerge from 
        https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
        
        ........
          r1001350 | winterz | 2009-07-22 19:34:04 -0400 (Wed, 22 Jul 2009) | 14 lines
          
          A better fix for dealing with invalid attendee status strings in Kolab.
          If the status is not one of the 5 valid strings, then make the internal
          setting Attendee::None.
          
          Once the internal setting Attendee::None is written back to the server, it will
          become needs-action.
          
          In no case is an invalid status string written back to the server.
          
          hopefully fixes kolab/issue3766
          MERGE: e4,trunk
          DO_NOT_BACKPORT: 4.3 (new i18n string)
        ........
      ................
    ................
  ................
    r1008457 | winterz | 2009-08-07 17:02:18 +0200 (Fri, 07 Aug 2009) | 12 lines
    
    Merged revisions 1008004 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1008004 | winterz | 2009-08-06 13:12:09 -0400 (Thu, 06 Aug 2009) | 5 lines
      
      Make life easier by using the separate class files for AssignmentVisitor 
      and ComparisonVisitor. Copied from trunk.
      
      MERGE: e4
    ........
  ................
................
  r1010807 | tmcguire | 2009-08-13 15:43:20 +0200 (Thu, 13 Aug 2009) | 26 lines
  
  SVN_MERGE
  Merged revisions 1008464 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
  
  ................
    r1008464 | winterz | 2009-08-07 17:10:58 +0200 (Fri, 07 Aug 2009) | 18 lines
    
    Merged revisions 1008129 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1008129 | winterz | 2009-08-06 19:17:26 -0400 (Thu, 06 Aug 2009) | 12 lines
      
      When an invitation incidence is being updated only, do not delete-then-add
      the incidence to the calendar; instead, use and AssignmentVisitor to 
      simply assign the update.  This is better because the user is not
      prompted with a Resource Selector dialog with a simple assignment.
      
      and when the user is not prompted they are not allowed to move
      the incidence to a different calendar resource -- which can lead
      to sorts of trouble.
      
      kolab/issue3776
    ........
  ................
................
  r1010813 | tmcguire | 2009-08-13 15:51:20 +0200 (Thu, 13 Aug 2009) | 21 lines
  
  SVN_MERGE
  Merged revisions 1009689 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
  
  ................
    r1009689 | winterz | 2009-08-10 18:19:03 +0200 (Mon, 10 Aug 2009) | 13 lines
    
    Merged revisions 1009672 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1009672 | winterz | 2009-08-10 11:46:13 -0400 (Mon, 10 Aug 2009) | 7 lines
      
      Support attachments in invitations.
      Kolab/issue3717
      
      FEATURE:
      MERGE: e4,trunk
    ........
  ................
................
  r1010815 | tmcguire | 2009-08-13 15:52:16 +0200 (Thu, 13 Aug 2009) | 14 lines
  
  SVN_MERGE
  Merged revisions 1009786 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
  
  ........
    r1009786 | winterz | 2009-08-10 22:54:32 +0200 (Mon, 10 Aug 2009) | 7 lines
    
    merge SVN commit 1009784 by winterz:
    
    don't print the Attachments section if there aren't any Attachments.
    improves the fix for kolab/issue3717
    MERGE: e4,trunk
  ........
................
  r1010816 | tmcguire | 2009-08-13 15:53:35 +0200 (Thu, 13 Aug 2009) | 19 lines
  
  SVN_MERGE
  Merged revisions 1010097 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
  
  ................
    r1010097 | winterz | 2009-08-11 18:00:58 +0200 (Tue, 11 Aug 2009) | 11 lines
    
    Merged revisions 1010087 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1010087 | winterz | 2009-08-11 11:36:12 -0400 (Tue, 11 Aug 2009) | 4 lines
      
      beautify the invitations display of attachments
      be nicer about attachment links that cannot be accessed.
      MERGE: e4,trunk
    ........
  ................
................
  r1010817 | tmcguire | 2009-08-13 15:54:32 +0200 (Thu, 13 Aug 2009) | 19 lines
  
  SVN_MERGE
  Merged revisions 1010408 via svnmerge from 
  svn+ssh://tmcguire@svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepimlibs
  
  ................
    r1010408 | winterz | 2009-08-12 13:43:58 +0200 (Wed, 12 Aug 2009) | 11 lines
    
    Merged revisions 1010324 via svnmerge from 
    https://svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r1010324 | vkrause | 2009-08-12 05:27:00 -0400 (Wed, 12 Aug 2009) | 4 lines
      
      Correctly preserve uids and scheduling ids when updating incidences.
      
      Kolab issue 3802
    ........
  ................
................
  r1010994 | mlaurent | 2009-08-13 20:39:48 +0200 (Thu, 13 Aug 2009) | 2 lines
  
  Fix iterator
................
  r1010995 | winterz | 2009-08-13 20:40:50 +0200 (Thu, 13 Aug 2009) | 3 lines
  
  remove HtmlExportSettings. it's a pain
  causes problems with svn checkouts on some platforms (case sensitivity with HTMLExportSettings)
................
  r1011486 | winterz | 2009-08-14 21:52:38 +0200 (Fri, 14 Aug 2009) | 3 lines
  
  minor coding style
  SVN_SILENT:
................
  r1011487 | winterz | 2009-08-14 21:56:41 +0200 (Fri, 14 Aug 2009) | 3 lines
  
  internet -> Internet
  DO_NOT_BACKPORT:
................
  r1011522 | winterz | 2009-08-15 00:51:19 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  explicit ctor
................
  r1011523 | winterz | 2009-08-15 00:53:55 +0200 (Sat, 15 Aug 2009) | 2 lines
  
  #include <QString> => #include <QtCore/QString>
................
  r1011524 | winterz | 2009-08-15 00:54:58 +0200 (Sat, 15 Aug 2009) | 3 lines
  
  minor coding style
  SVN_SILENT:
................
  r1011525 | winterz | 2009-08-15 01:00:52 +0200 (Sat, 15 Aug 2009) | 3 lines
  
  spelling: internet => Internet
  SVN_SILENT:
................
  r1011526 | winterz | 2009-08-15 01:01:58 +0200 (Sat, 15 Aug 2009) | 4 lines
  
  minor
  replace("\n","\r\n") -> replace('\n',..)
  SVN_SILENT:
................
  r1011716 | tnyblom | 2009-08-15 17:47:37 +0200 (Sat, 15 Aug 2009) | 3 lines
  
  Add test case for (already fixed) error in bug 203881
................
  r1011838 | winterz | 2009-08-16 02:25:16 +0200 (Sun, 16 Aug 2009) | 5 lines
  
  Do not write VALUE=TEXT property for custom properties starting with "X-MOZ", which 
  should take care of "X-MOZILLA" too.
  
  BUG: 203227
................
  r1011953 | winterz | 2009-08-16 15:00:01 +0200 (Sun, 16 Aug 2009) | 4 lines
  
  Don't crash when formatting the recurrence string for a yearly recurrence on a day-of-week.
  BUG: 203999
  MERGE: e4,4.3
................
  r1012109 | staniek | 2009-08-16 22:05:33 +0200 (Sun, 16 Aug 2009) | 2 lines
  
  warning--: QMetaObject is struct 
................
  r1012151 | tmcguire | 2009-08-17 01:12:55 +0200 (Mon, 17 Aug 2009) | 8 lines
  
  Don't remove my whitespace if I set the PreserceSpaces flag.
  Strange is that the code seems to do that intentionally, but it is so old that svn annotate doesn't say anything useful.
  
  
  Add small unit test for that.
  
  BUG :204101
................

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