[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim (silent)
From:       Volker Krause <vkrause () kde ! org>
Date:       2008-01-29 17:13:53
Message-ID: 1201626833.302385.28423.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 768281 by vkrause:

SVN_SILENT block stuff from the 3.5 <-> enterprise sync

Blocked revisions 764822,764850,764876,765074-765075,765080,765083,765132,765141-76514 \
2,765144,765224,765226-765227,765230,765311,765320,765323,765330,765335,765338,765342- \
765345,765350,765363-765368,765380,765382,765384,765578,765746,765750,765755-765756,76 \
5761,765763,765766,765768,765770-765772,765775-765776,765779,765785-765788,765791,7658 \
04,765853,766057,766086,766090,766094-766095,766121,766140,766218,766233,766247,766267 \
,766279,766288,766345,766357,766367,766371,766374,766389,766421,766539,766781,766783,766790,766832,766835,766837,767027,767030,767041,767047,767552,767555,767557 \
via svnmerge

................
  r764822 | pradeepto | 2008-01-22 18:03:51 +0100 (Tue, 22 Jan 2008) | 15 lines
  
  Blocked revisions 702345 via svnmerge
  
  ........
    r702345 | vkrause | 2007-08-20 18:27:19 +0530 (Mon, 20 Aug 2007) | 9 lines
    
    Backport SVN commit 700851 by moenicke:
    
    * fix for kolab issue 1882 (Crash after reply to a revoked mail):
      The storage needs to be open before remove is called, otherwise
      it will not unregister the corresponding serial numbers from
      the message dict, since its message list is empty, and the .ids
      file contents are not loaded. That can lead to lookups in the
      dict returning stale pointers to the folder later.
  ........
................
  r764850 | pradeepto | 2008-01-22 19:26:08 +0100 (Tue, 22 Jan 2008) | 24 lines
  
  Blocked revisions 703251 via svnmerge
  
  ........
    r703251 | vkrause | 2007-08-22 14:23:07 +0530 (Wed, 22 Aug 2007) | 18 lines
    
    Backport SVN commit 703234 by tilladam:
    
    Make sure the crypto state is not restored from headers if there are no headers.
    Thanks to Alexis Papadopoulos for noticing, and for coming up with a patch 
    for this in the first place.
    
    
    Backport SVN commit 702320 by tilladam:
    
    Make sure to store the state of the crypto actions when saving a mail to 
    drafts, but only if the state of the mail itself should not be used as
    indication of the state of the actions. This is governd by the option
    to "never sign and encrypt when saving to drafts" in the security 
    settings.
    
    Prokde35-z item 44.
    KDE BUG: 103240
  ........
................
  r764876 | pradeepto | 2008-01-22 20:21:19 +0100 (Tue, 22 Jan 2008) | 110 lines
  
  Blocked revisions 703392,703471,703488,703767,703913,704211,705221 via svnmerge
  
  ................
    r703392 | vkrause | 2007-08-22 17:55:22 +0530 (Wed, 22 Aug 2007) | 6 lines
    
    Forwardport SVN commit 703382 by vkrause:
    
    Actually enforce the minimum mailcheck interval setting.
    
    Kolab issue 1640.
  ................
    r703471 | vkrause | 2007-08-22 20:50:03 +0530 (Wed, 22 Aug 2007) | 2 lines
    
    SVN_SILENT initialize svnmerge for enterprise -> 3.5 merging
  ................
    r703488 | vkrause | 2007-08-22 21:54:27 +0530 (Wed, 22 Aug 2007) | 25 lines
    
    Merged revisions 703473 via svnmerge from
    https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ................
      r703473 | vkrause | 2007-08-22 17:21:45 +0200 (Wed, 22 Aug 2007) | 18 lines
    
      Merged revisions 702953-703455 via svnmerge from
      https://vkrause@svn.kde.org/home/kde/branches/work/~vkrause/enterprise
    
      ........
        r702953 | vkrause | 2007-08-21 18:36:00 +0200 (Tue, 21 Aug 2007) | 3 lines
    
        Store seen flag on the server even in read-only folders, given the 's'
        ACL flag is set.
      ........
        r703210 | vkrause | 2007-08-22 09:43:04 +0200 (Wed, 22 Aug 2007) | 2 lines
    
        Read seen flag also for read-only folder with the 's' ACL bit set.
      ........
        r703455 | vkrause | 2007-08-22 16:37:33 +0200 (Wed, 22 Aug 2007) | 2 lines
    
        Read/write seen flags on read-only online IMAP folders.
      ........
    ................
  ................
    r703767 | vkrause | 2007-08-23 14:02:33 +0530 (Thu, 23 Aug 2007) | 9 lines
    
    Merged revisions 703752 via svnmerge from
    https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r703752 | tilladam | 2007-08-23 09:31:40 +0200 (Thu, 23 Aug 2007) | 2 lines
    
      Don't crash when the result returned by gpgme is 0.
    ........
  ................
    r703913 | vkrause | 2007-08-23 21:23:18 +0530 (Thu, 23 Aug 2007) | 23 lines
    
    Merged revisions 703903 via svnmerge from 
    https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ................
      r703903 | vkrause | 2007-08-23 17:19:35 +0200 (Thu, 23 Aug 2007) | 16 lines
      
      Merged revisions 703856-703887 via svnmerge from 
      https://vkrause@svn.kde.org/home/kde/branches/work/~vkrause/enterprise
      
      ........
        r703856 | vkrause | 2007-08-23 14:57:25 +0200 (Thu, 23 Aug 2007) | 2 lines
        
        Add migration infrastructure to transfer local flags to the server.
      ........
        r703887 | vkrause | 2007-08-23 16:34:57 +0200 (Thu, 23 Aug 2007) | 5 lines
        
        Configuration update script to trigger migration of local IMAP flags to
        the server. This should solve a regression due to the recent changes to
        store the seen flag on the server also for read-only folders where all
        local flags were overwritten.
      ........
    ................
  ................
    r704211 | vkrause | 2007-08-24 16:01:36 +0530 (Fri, 24 Aug 2007) | 25 lines
    
    Merged revisions 703997-704180 via svnmerge from 
    https://vkrause@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim
    
    ........
      r703997 | tilladam | 2007-08-23 23:00:11 +0200 (Thu, 23 Aug 2007) | 3 lines
      
      Retain the vacation file name across trips through the editin widget.
      kolab/issue1743
    ........
      r704063 | tilladam | 2007-08-24 07:28:50 +0200 (Fri, 24 Aug 2007) | 2 lines
      
      Oops.
    ........
      r704165 | tilladam | 2007-08-24 09:33:58 +0200 (Fri, 24 Aug 2007) | 3 lines
      
      Initialize the name column to a more reasonable 120.
      kolab/issue 1894.
    ........
      r704180 | tilladam | 2007-08-24 10:43:04 +0200 (Fri, 24 Aug 2007) | 4 lines
      
      Fix parsing of @ in name parts of email addresses, when in quotes.
      Fix tests to all pass again.
      kolab/issue1713
    ........
  ................
    r705221 | bvirlet | 2007-08-27 19:23:12 +0530 (Mon, 27 Aug 2007) | 2 lines
    
    Correct fix for https://bugzilla.novell.com/show_bug?id=273550
  ................
................
  r765074 | pradeepto | 2008-01-23 05:24:10 +0100 (Wed, 23 Jan 2008) | 10 lines
  
  Merged revisions 705813 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r705813 | tstaerk | 2007-08-28 22:15:20 +0530 (Tue, 28 Aug 2007) | 3 lines
    
    backport 705768
    CCBUGS:149302
  ........
................
  r765075 | pradeepto | 2008-01-23 05:30:09 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 705952 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r705952 | winterz | 2007-08-29 06:14:15 +0530 (Wed, 29 Aug 2007) | 2 lines
    
    updated, from Michal VanĨo
  ........
................
  r765080 | pradeepto | 2008-01-23 06:01:42 +0100 (Wed, 23 Jan 2008) | 13 lines
  
  Blocked revisions 706174,708671 via svnmerge
  
  ........
    r706174 | bvirlet | 2007-08-29 21:54:41 +0530 (Wed, 29 Aug 2007) | 3 lines
    
    Fix precommand: KProcess in the stack is bad.
    Fix Local Mailbox and Maildir.
  ........
    r708671 | bvirlet | 2007-09-05 16:39:16 +0530 (Wed, 05 Sep 2007) | 2 lines
    
    Revert changes which most probably are the reasons of the bugs in kmail.
  ........
................
  r765083 | pradeepto | 2008-01-23 06:13:50 +0100 (Wed, 23 Jan 2008) | 8 lines
  
  Blocked revisions 706425 via svnmerge
  
  ........
    r706425 | bvirlet | 2007-08-30 17:20:14 +0530 (Thu, 30 Aug 2007) | 2 lines
    
    Fix crash on retrieving pop mail.
  ........
................
  r765132 | pradeepto | 2008-01-23 09:49:57 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 708310 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r708310 | winterz | 2007-09-04 19:16:03 +0530 (Tue, 04 Sep 2007) | 3 lines
    
    update to tzdata version g
  ........
................
  r765141 | pradeepto | 2008-01-23 10:23:32 +0100 (Wed, 23 Jan 2008) | 26 lines
  
  Blocked revisions 708720,708803,709253,709511,709812 via svnmerge
  
  ........
    r708720 | vkrause | 2007-09-05 19:29:45 +0530 (Wed, 05 Sep 2007) | 3 lines
    
    SVN_SILENT block lots of stuff we don't want to merge back from
    the enterprise branch
  ........
    r708803 | djarvie | 2007-09-05 22:45:21 +0530 (Wed, 05 Sep 2007) | 1 line
    
    Fix whatsthis text to describe actual behaviour
  ........
    r709253 | djarvie | 2007-09-07 04:44:54 +0530 (Fri, 07 Sep 2007) | 2 lines
    
    Enable/disable "Show expired alarms" action when preferences change
  ........
    r709511 | djarvie | 2007-09-07 22:51:22 +0530 (Fri, 07 Sep 2007) | 1 line
    
    Prevent recurrence data being left in event if it has been removed
  ........
    r709812 | djarvie | 2007-09-08 15:22:03 +0530 (Sat, 08 Sep 2007) | 3 lines
    
    Fix deferrals of recurring alarms not triggering correctly.
    Fix failure to archive details of repetitions within a recurrence.
  ........
................
  r765142 | pradeepto | 2008-01-23 10:30:20 +0100 (Wed, 23 Jan 2008) | 8 lines
  
  Blocked revisions 709181 via svnmerge
  
  ........
    r709181 | djarvie | 2007-09-07 00:02:57 +0530 (Fri, 07 Sep 2007) | 1 line
    
    Fix deferral alarm offset
  ........
................
  r765144 | pradeepto | 2008-01-23 10:53:35 +0100 (Wed, 23 Jan 2008) | 12 lines
  
  Blocked revisions 709141,709147 via svnmerge
  
  ........
    r709141 | tokoe | 2007-09-06 22:01:14 +0530 (Thu, 06 Sep 2007) | 2 lines
    
    Backport fix for crash in groupware mode
  ........
    r709147 | tokoe | 2007-09-06 22:03:53 +0530 (Thu, 06 Sep 2007) | 2 lines
    
    compile++
  ........
................
  r765224 | pradeepto | 2008-01-23 15:59:01 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 761881 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r761881 | winterz | 2008-01-15 20:16:25 +0530 (Tue, 15 Jan 2008) | 2 lines
    
    forward port: change easter to pascha
  ........
................
  r765226 | pradeepto | 2008-01-23 16:20:46 +0100 (Wed, 23 Jan 2008) | 10 lines
  
  Blocked revisions 763519 via svnmerge
  
  ........
    r763519 | kloecker | 2008-01-19 23:01:51 +0530 (Sat, 19 Jan 2008) | 4 lines
    
    Do not quote double quotes and backslashes when setting the display name in the \
mailAddress object. The necessary quoting is applied in mailAddress::getStr() when \
the email address is composed from its different parts.  
    BUG: 48560
  ........
................
  r765227 | pradeepto | 2008-01-23 16:36:21 +0100 (Wed, 23 Jan 2008) | 8 lines
  
  Blocked revisions 761044 via svnmerge
  
  ........
    r761044 | mkoller | 2008-01-14 04:31:57 +0530 (Mon, 14 Jan 2008) | 2 lines
    
    make sure to see all checked phone types
  ........
................
  r765230 | pradeepto | 2008-01-23 16:42:50 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  SVN_SILENT - blocked it by mistake :/
  Unblocked revisions 761044 via svnmerge
  
  ........
    r761044 | mkoller | 2008-01-14 04:31:57 +0530 (Mon, 14 Jan 2008) | 2 lines
    
    make sure to see all checked phone types
  ........
................
  r765311 | tilladam | 2008-01-23 21:41:56 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 658667 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r658667 | scripty | 2007-04-28 05:30:25 +0200 (Sat, 28 Apr 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765320 | tilladam | 2008-01-23 21:58:07 +0100 (Wed, 23 Jan 2008) | 1 line
  
  Block kalarm changes, we'll merge it wholesale.
................
  r765323 | tilladam | 2008-01-23 22:08:15 +0100 (Wed, 23 Jan 2008) | 1 line
  
  Block the remaining kalarm commits, we'll merge it in wholesale.
................
  r765330 | tilladam | 2008-01-23 22:16:27 +0100 (Wed, 23 Jan 2008) | 1 line
  
  Merge in kalarm from 3.5 branch. It has not been changed in enterprise branch.
................
  r765335 | tilladam | 2008-01-23 22:22:41 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 660545 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r660545 | scripty | 2007-05-03 05:30:34 +0200 (Thu, 03 May 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765338 | tilladam | 2008-01-23 22:30:11 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 686053 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r686053 | mueller | 2007-07-10 15:28:08 +0200 (Tue, 10 Jul 2007) | 2 lines
    
    pedantic--
  ........
................
  r765342 | tilladam | 2008-01-23 22:34:57 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 690260 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r690260 | anirudh | 2007-07-20 16:39:12 +0200 (Fri, 20 Jul 2007) | 1 line
    
    Added missing license headers for jescs/evo2/synce/moto plugins
  ........
................
  r765343 | tilladam | 2008-01-23 22:36:05 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 690263 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r690263 | anirudh | 2007-07-20 16:45:42 +0200 (Fri, 20 Jul 2007) | 1 line
    
    Added configuration dialog for Sunbird plugin
  ........
................
  r765344 | tilladam | 2008-01-23 22:37:04 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 690363 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r690363 | tokoe | 2007-07-20 22:18:46 +0200 (Fri, 20 Jul 2007) | 2 lines
    
    Code cleanup and make it compile
  ........
................
  r765345 | tilladam | 2008-01-23 22:38:37 +0100 (Wed, 23 Jan 2008) | 2 lines
  
  SVNSILENT merge from 3.5
................
  r765350 | tilladam | 2008-01-23 22:44:56 +0100 (Wed, 23 Jan 2008) | 10 lines
  
  Merged revisions 744871 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r744871 | tstaerk | 2007-12-04 20:09:38 +0100 (Tue, 04 Dec 2007) | 3 lines
    
    Do not append completed tasks to active list
    CCBUGS:91732
  ........
................
  r765363 | tilladam | 2008-01-23 22:58:07 +0100 (Wed, 23 Jan 2008) | 12 lines
  
  Merged revisions 717082 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r717082 | winterz | 2007-09-26 04:08:03 +0200 (Wed, 26 Sep 2007) | 5 lines
    
    add holidays for Argentina.
    by Daniel Vega. Thanks!
    
    BUGS: 150203
  ........
................
  r765364 | tilladam | 2008-01-23 22:58:47 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 719367 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r719367 | scripty | 2007-10-01 04:46:19 +0200 (Mon, 01 Oct 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765365 | tilladam | 2008-01-23 23:00:42 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 725947 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r725947 | winterz | 2007-10-16 19:17:51 +0200 (Tue, 16 Oct 2007) | 2 lines
    
    update to tzdata version h
  ........
................
  r765366 | tilladam | 2008-01-23 23:01:54 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 748304 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r748304 | scripty | 2007-12-14 05:24:21 +0100 (Fri, 14 Dec 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765367 | tilladam | 2008-01-23 23:03:52 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 664071 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r664071 | scripty | 2007-05-13 05:33:10 +0200 (Sun, 13 May 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765368 | tilladam | 2008-01-23 23:04:27 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 665462 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r665462 | scripty | 2007-05-17 05:33:47 +0200 (Thu, 17 May 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765380 | tilladam | 2008-01-23 23:23:12 +0100 (Wed, 23 Jan 2008) | 2 lines
  
  Merge desktop file changes to kmobile.
................
  r765382 | tilladam | 2008-01-23 23:25:43 +0100 (Wed, 23 Jan 2008) | 8 lines
  
  Blocked revisions 660891 via svnmerge
  
  ........
    r660891 | scripty | 2007-05-04 05:28:26 +0200 (Fri, 04 May 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765384 | tilladam | 2008-01-23 23:30:36 +0100 (Wed, 23 Jan 2008) | 9 lines
  
  Merged revisions 722970 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r722970 | coolo | 2007-10-08 13:05:56 +0200 (Mon, 08 Oct 2007) | 1 line
    
    updating lsm
  ........
................
  r765578 | vkrause | 2008-01-24 12:10:56 +0100 (Thu, 24 Jan 2008) | 2 lines
  
  Build with kdelibs older than 3.5.8 as well.
................
  r765746 | ahartmetz | 2008-01-24 18:00:55 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 662405 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r662405 | scripty | 2007-05-08 05:32:00 +0200 (Di, 08 Mai 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765750 | vkrause | 2008-01-24 18:16:21 +0100 (Thu, 24 Jan 2008) | 108 lines
  
  SVN_SILENT
  
  Merged revisions 673392-674568,674570-674690,674692-674890,674892-674931,674933-6750 \
16,675018-675060,675062-675089,675091-676369,676371-676695,676697-677627,677629-678557 \
,678559-678762,678764-678949,678951-680181,680183-680228,680230-682310,682312-683347,6 \
83349-683590,683592-684041,684043-685298,685300-685330,685332-685748,685750-686052,686 \
054-686215,686217-686452,686454-687344,687346-687819,687821-688196,688198-688530,68853 \
2-689003,689005-689073,689075-689499,689501-689589,689591-689896,689898-689907,689909- \
690259,690261-690262,690264-690362,690364-691426,691428-691444,691446-691749,691751-69 \
2352,692354-692850,692852-694291,694293-694493,694495-695170,695172-695468,695470-6954 \
73,695475-695524,695526-695878,695880-696185,696187-696819,696821-696979,696981-698166 \
,698168-699553,699556-700022,700024-700037,700039-702251,702253-702344,702346-702682,7 \
02684-703250,703252-703391,703393-703470,703472-703487,703489-703632,703634-703766,703768-703907,703909-703912,703914-703927,70392
  9-704049,704051-704210,704212-705214,705216-705220,705222-705812,705814-705951,70595 \
3-706173,706175-706424,706426-707911,707913-707939,707941-708005,708007-708309,708311- \
708652,708654-708670,708672-708719,708721-708802,708804-709140,709142-709146,709148-70 \
9180,709182-709252,709254-709510,709512-709811,709813-709864,709866-709873,709875-7102 \
77,710279-710765,710767-710780,710782-711533,711535-712428,712430-713465,713467-713486 \
,713488-713780,713782-714098,714100-714451,714453-714806,714808-714809,714811-715296,7 \
15298-716783,716785-717081,717083-717101,717103-717165,717167-719366,719368-719527,719 \
529-719674,719676-720155,720157-720287,720289-720299,720302,720304-720927,720929-72111 \
7,721119-721290,721292-721754,721756-721842,721844-721899,721901-721987,721989-722200, \
722202-722511,722513-722728,722731-722969,722971-724216,724218-725946,725948-726650,72 \
6652-726681,726683-727906,727908-728889,728891-728946,728948-729335,729337-729902,729904-730389,730391-730526,730528-730904,730906-
  731457,731460-731461,731463-732114,732116-732430,732432-732920,732922-733422,733424- \
733840,733842-734069,734071-734507,734509-734732,734734-734908,734910-734916,734918-73 \
5019,735021-735025,735027-735152,735154-735420,735422-735568,735570-735807,735809-7361 \
08,736110-736775,736777-736786,736788-737262,737264-738321,738323-738396,738398-739758 \
,739760-740092,740094-744172,744174-744870,744872-745677,745679-746088,746090-746092,7 \
46094,746096-746615,746617-746732,746734-747273,747275-747282,747284-748303,748305-750 \
128,750130-750192,750194-750639,750641-750752,750754-751259,751261-756266,756268-75810 \
2,758105-758345,758347-758408,758410-760556,760558-761041,761043,761045-761880,761882- \
762605,762607-762751,762753-762828,762830-762832,762834-763234,763236-763518,763520-76 \
4056,764058-764863,764865-764991,764993-764998,765000-765012,765014-765018,765020-765128 \
via svnmerge from   https://vkrause@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r673392 | vanrijn | 2007-06-10 07:57:59 +0200 (Sun, 10 Jun 2007) | 1 line
    
    bumping version for next release, should there be one
  ........
    r699005 | vanrijn | 2007-08-11 21:50:19 +0200 (Sat, 11 Aug 2007) | 6 lines
    
    - adding patch submitted by Oleg Sidorkin to not delete the AddressBook
      pointer if we're using the StdAddressBook::self() singleton
    - bumping version to 4.9.2-358 (4.9.2 a bump up, and the 358 to match the
      upcoming kde 3.5.8 release, because honestly I can never remember which
      kpilot release corresponds to which kde release  =:/)
  ........
    r700839 | vanrijn | 2007-08-16 17:40:06 +0200 (Thu, 16 Aug 2007) | 5 lines
    
    - changing WARNINGKPILOT to DEBUGKPILOT for "unable to open port" errors.
      these happen _all_ the time, especially with usb devices, and we don't
      need to litter our user's output with them.
    - raising debug level of close() to 2 to match rest of device comm stuff
  ........
    r703081 | vanrijn | 2007-08-21 23:47:18 +0200 (Tue, 21 Aug 2007) | 6 lines
    
    - taking out attempt to try new database name.  didn't fix the problem.
      use standard (old) database format
    - logic bug in memofiles which caused conduit to think it was a first-time
      sync if it couldn't load any memofiles from disk.  truth is, we should
      return true unless there wasn't a metatdata file at all, otherwise true.
  ........
    r703459 | vanrijn | 2007-08-22 16:43:54 +0200 (Wed, 22 Aug 2007) | 3 lines
    
    - making sure max length of memo (8192) is honored so we don't make memo
      database go boom
  ........
    r717734 | vanrijn | 2007-09-27 14:07:27 +0200 (Thu, 27 Sep 2007) | 6 lines
    
    - fixing typo'd method name (_cleanupAddreessBookPointer() ->
      _cleanupAddressBookPointer() )
    - trying to squash stupid conduit crash that happens as a result of
      ~AbbrowserConduit. not sure why AddressBook* was declared as static, but
      I see no reason for it to be.  may be contributing to the crash too.
  ........
    r738993 | vanrijn | 2007-11-20 06:32:54 +0100 (Tue, 20 Nov 2007) | 1 line
    
    bumping version number.  trying to get dynamic_cast to not fail on debian, grr
  ........
    r738994 | vanrijn | 2007-11-20 06:44:47 +0100 (Tue, 20 Nov 2007) | 1 line
    
    removing more inlines in hopes that it will beat debian's dynamic_cast into \
                submission
  ........
    r739034 | vanrijn | 2007-11-20 10:24:21 +0100 (Tue, 20 Nov 2007) | 7 lines
    
    - Apparently, we can't expect rtti to work if we're subclassing a class
      that doesn't have virtual methods.  Also, QCustomEvent has gone bye-bye
      in Qt4.  So, we'll subclass QEvent, use QObject::event() instead of
      QObject::customEvent(), and use static_cast instead of dynamic_cast.  All
      of this combined should hopefully put an end to the problems I was seeing
      with dynamic_cast segfaulting (he says, hopefully).
  ........
    r739330 | vanrijn | 2007-11-20 22:24:10 +0100 (Tue, 20 Nov 2007) | 3 lines
    
    - bullet-proofing again as I wage war on the evil debian compilers.  Looks
      like something's getting optimized out of memory?
  ........
    r749517 | vanrijn | 2007-12-17 10:44:39 +0100 (Mon, 17 Dec 2007) | 11 lines
    
    - Woot! Fixing major breakage for funky usb devices.  pulled back some
      removed code from KDE 3.5.6's kpilot for usb workaround code and fit it
      into the new threaded model.  This fixes syncing for me on my Palm Treo
      700p.
    - Reformatting and cleaning up kpilotdevicelink.cc.
    - New Private.h to hold the bits of kpilotdevicelink.cc that should not be
      exposed via kpilotdevicelink.h.  Also, DeviceCommThread extends QObject
      and QThread, so we need to have automoc run on it.
    - Switching from using QCustomEvent to using QEvent for device tickle
      thread to match what is done in kpilotdevicelink.  
  ........
    r754992 | vanrijn | 2007-12-31 03:49:50 +0100 (Mon, 31 Dec 2007) | 10 lines
    
    * Fixing bug reported by Pablo Yepes on kdepim-users mailing list. We did
      severe goofiness with middle names... The Palm can't handle them, so we
      blindly tacked firstname + " " + lastname and stuck it into the Palm's
      firstname field. The problem is that whenever a copy from palm->pc is
      done, the kludged first name is transferred to kabc ("firstname middle").
      And, it's compounded by every change in either direction. It's an ugly
      hack and I've removed it. The only way to work around it would be to add
      an additional check for !firstname.endsWith(abEntry.additionalName()),
      but that's even sillier. Stop the insanity!
  ........
    r760583 | vanrijn | 2008-01-13 01:54:38 +0100 (Sun, 13 Jan 2008) | 1 line
    
    bumping version number for 3.5.9 release
  ........
    r765128 | vanrijn | 2008-01-23 09:36:04 +0100 (Wed, 23 Jan 2008) | 8 lines
    
    - Using a mutex to access the static QTextCodec. It's supposed to be
      reentrant, but all the cool kids are using mutexes these days, and it's
      an extra layer of bullet-proofing. Safety first!
    - Also, it seems to be important that we attempt to pass the real length of
      the string to QTextCodec instead of always passing the max length of 16.
      This fixes the crash I was seeing from running KPilot3 in a KDE4 session
      and I don't see the error from valgrind anymore either.
  ........
................
  r765755 | vkrause | 2008-01-24 18:25:50 +0100 (Thu, 24 Jan 2008) | 11 lines
  
  SVN_SILENT
  
  Recorded merge of revisions 721900 via svnmerge from 
  https://vkrause@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r721900 | djarvie | 2007-10-06 10:45:10 +0200 (Sat, 06 Oct 2007) | 1 line
    
    Suppress verbose debug output
  ........
................
  r765756 | ahartmetz | 2008-01-24 18:28:58 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Recorded merge of revisions 667536 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r667536 | scripty | 2007-05-23 05:30:37 +0200 (Mi, 23 Mai 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765761 | ahartmetz | 2008-01-24 18:37:00 +0100 (Thu, 24 Jan 2008) | 11 lines
  
  Merged revisions 669784 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r669784 | nlecureuil | 2007-05-30 14:15:34 +0200 (Mi, 30 Mai 2007) | 4 lines
    
    Fix some categories inside desktop files
    Signed-off-by: Boiko
    CCMAIL: boiko@mandriva.com
  ........
................
  r765763 | vkrause | 2008-01-24 18:41:46 +0100 (Thu, 24 Jan 2008) | 20 lines
  
  SVN_SILENT
  
  Merged revisions 765439-765760 via svnmerge from 
  https://vkrause@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r765439 | djarvie | 2008-01-24 01:08:14 +0100 (Thu, 24 Jan 2008) | 2 lines
    
    Replace simple repetitions with recurrence sub-repetitions, to save confusion
  ........
    r765455 | djarvie | 2008-01-24 02:20:54 +0100 (Thu, 24 Jan 2008) | 3 lines
    
    Reduce size of alarm edit dialog.
    Replace month week day name translatable strings by calls to KCalendarSystem.
  ........
    r765760 | vkrause | 2008-01-24 18:35:41 +0100 (Thu, 24 Jan 2008) | 2 lines
    
    compile
  ........
................
  r765766 | ahartmetz | 2008-01-24 18:47:21 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Recorded merge of revisions 683591 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r683591 | scripty | 2007-07-05 04:36:08 +0200 (Do, 05 Jul 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765768 | ahartmetz | 2008-01-24 18:50:37 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 702683 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r702683 | scripty | 2007-08-21 04:47:07 +0200 (Di, 21 Aug 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765770 | ahartmetz | 2008-01-24 18:52:19 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 703633 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r703633 | scripty | 2007-08-23 04:51:45 +0200 (Do, 23 Aug 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765771 | ahartmetz | 2008-01-24 18:53:59 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 704050 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r704050 | scripty | 2007-08-24 04:46:57 +0200 (Fr, 24 Aug 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765772 | vkrause | 2008-01-24 18:55:42 +0100 (Thu, 24 Jan 2008) | 11 lines
  
  SVN_SILENT
  Recorded merge of revisions 714810 via svnmerge from 
  https://vkrause@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r714810 | winterz | 2007-09-20 19:06:34 +0200 (Thu, 20 Sep 2007) | 3 lines
    
    fix typo
    CCBUG: 144946
  ........
................
  r765775 | ahartmetz | 2008-01-24 18:59:20 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Recorded merge of revisions 713781 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r713781 | scripty | 2007-09-18 04:55:16 +0200 (Di, 18 Sep 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765776 | ahartmetz | 2008-01-24 19:01:18 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 717102 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r717102 | scripty | 2007-09-26 05:01:38 +0200 (Mi, 26 Sep 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765779 | ahartmetz | 2008-01-24 19:05:38 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 720928 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r720928 | scripty | 2007-10-04 04:47:35 +0200 (Do, 04 Okt 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765785 | ahartmetz | 2008-01-24 19:14:15 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Recorded merge of revisions 730527 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r730527 | scripty | 2007-10-29 05:28:29 +0100 (Mo, 29 Okt 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765786 | ahartmetz | 2008-01-24 19:15:05 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 730905 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r730905 | scripty | 2007-10-30 05:13:44 +0100 (Di, 30 Okt 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765787 | ahartmetz | 2008-01-24 19:15:50 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 732921 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r732921 | scripty | 2007-11-05 05:16:12 +0100 (Mo, 05 Nov 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765788 | ahartmetz | 2008-01-24 19:20:37 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 735569 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r735569 | scripty | 2007-11-12 05:18:11 +0100 (Mo, 12 Nov 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765791 | ahartmetz | 2008-01-24 19:23:13 +0100 (Thu, 24 Jan 2008) | 9 lines
  
  Merged revisions 727907 via svnmerge from 
  svn+ssh://ahartmetz@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r727907 | scripty | 2007-10-22 04:52:08 +0200 (Mo, 22 Okt 2007) | 1 line
    
    SVN_SILENT made messages (.desktop file)
  ........
................
  r765804 | vkrause | 2008-01-24 19:33:50 +0100 (Thu, 24 Jan 2008) | 16 lines
  
  SVN_SILENT
  
  Merged revisions 721291-721754,721756-721842,721844-721899,721901-721987,721989-722201 \
via svnmerge from   https://vkrause@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r721291 | tstaerk | 2007-10-05 00:45:05 +0200 (Fri, 05 Oct 2007) | 3 lines
    
    enable interval mail checking by default
    BUGS:150469
  ........
    r722201 | tstaerk | 2007-10-06 23:48:38 +0200 (Sat, 06 Oct 2007) | 1 line
    
    As discussed with Allen, reverting patch.
  ........
................
  r765853 | vkrause | 2008-01-24 20:45:15 +0100 (Thu, 24 Jan 2008) | 2 lines
  
  SVN_SILENT make this equal to the 3.5 branch
................
  r766057 | pradeepto | 2008-01-25 05:55:14 +0100 (Fri, 25 Jan 2008) | 8 lines
  
  Blocked revisions 765892 via svnmerge
  
  ........
    r765892 | vkrause | 2008-01-25 02:19:02 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge build fixes from enterprise branch.
  ........
................
  r766086 | tilladam | 2008-01-25 09:00:27 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  Remove ksync, as in 3.5.
................
  r766090 | vkrause | 2008-01-25 09:08:55 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  SVN_SILENT merge ksync removal from 3.5 branch
................
  r766094 | vkrause | 2008-01-25 09:15:50 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  SVN_SILENT Merge changes from 3.5 branch.
................
  r766095 | tilladam | 2008-01-25 09:17:24 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  Merge in korn fixes.
................
  r766121 | pradeepto | 2008-01-25 11:26:45 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  -- Merging .desktop files@kresources from 3.5 branch.
................
  r766140 | pradeepto | 2008-01-25 12:58:00 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merge .desktop files@kaddressbook from 3.5 branch
................
  r766218 | pradeepto | 2008-01-25 13:43:24 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merging .desktop files @ KMail from 3.5 branch
................
  r766233 | pradeepto | 2008-01-25 13:51:56 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merging .desktop files @ KNotes from 3.5 branch.
................
  r766247 | tilladam | 2008-01-25 14:15:59 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  cleanup
................
  r766267 | pradeepto | 2008-01-25 14:56:35 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merging partial .desktop files @ KOrganizer. Moving to other box == faster \
                connection. :)
................
  r766279 | pradeepto | 2008-01-25 15:23:20 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merging .desktop files @ KOrganizer from 3.5 branch.
................
  r766288 | pradeepto | 2008-01-25 15:50:24 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merging .desktop files @ kresources from 3.5 branch.
................
  r766345 | pradeepto | 2008-01-25 17:27:48 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merging rest of .desktop files from 3.5 branches. Only Kontact/plug-in remains. \
                Still undecided about it since there was plugin API change.
................
  r766357 | pradeepto | 2008-01-25 18:09:02 +0100 (Fri, 25 Jan 2008) | 2 lines
  
   -- Merging .desktop files @ certmanger from 3.5.
................
  r766367 | vkrause | 2008-01-25 18:28:17 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  SVN_SILENT sync with 3.5 branch
................
  r766371 | vkrause | 2008-01-25 18:39:53 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  SVN_SILENT sync with 3.5 branch
................
  r766374 | vkrause | 2008-01-25 18:53:12 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  SVN_SILENT merge update of upstream copies from 3.5 branch
................
  r766389 | tilladam | 2008-01-25 19:16:09 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  Neutralize diff to 3.5. Mostly whitespace.
................
  r766421 | vkrause | 2008-01-25 21:20:37 +0100 (Fri, 25 Jan 2008) | 2 lines
  
  SVN_SILENT sync with 3.5 branch
................
  r766539 | pradeepto | 2008-01-26 06:58:19 +0100 (Sat, 26 Jan 2008) | 144 lines
  
  Blocked revisions 766087,766091,766100,766107,766109-766110,766117,766119,766125,766 \
269,766296,766308-766309,766312,766343,766346-766347,766349,766352-766353,766360,766364,766368-766370,766378,766380,766386,766388,766401,766416,766428,766430 \
via svnmerge  
  ........
    r766087 | vkrause | 2008-01-25 13:31:03 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge test fix from enterprise branch.
  ........
    r766091 | vkrause | 2008-01-25 13:39:39 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge unittests from enterprise branch.
  ........
    r766100 | tilladam | 2008-01-25 14:09:25 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Add the scalix resource from enterprise branch.
  ........
    r766107 | tilladam | 2008-01-25 14:19:40 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge in scaliz wizard.
  ........
    r766109 | tilladam | 2008-01-25 14:21:17 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Hook in the scalix resource.
  ........
    r766110 | tilladam | 2008-01-25 14:26:31 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    And add those.
  ........
    r766117 | tilladam | 2008-01-25 15:16:46 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge in enterprise branch changes and API additions.
  ........
    r766119 | tilladam | 2008-01-25 15:49:31 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Fix encoding.
  ........
    r766125 | tilladam | 2008-01-25 16:16:36 +0530 (Fri, 25 Jan 2008) | 3 lines
    
    custom flags and other protocol extensions needed for kolab,
    server side flag storage and scalix.
  ........
    r766269 | tilladam | 2008-01-25 19:32:56 +0530 (Fri, 25 Jan 2008) | 3 lines
    
    Merge the kolab resource extensions from enterprise branch. kcal
    API changes to follow shortly.
  ........
    r766296 | tilladam | 2008-01-25 20:25:30 +0530 (Fri, 25 Jan 2008) | 3 lines
    
    Merge changes from enterprise branch. Support for inline attachments,
    various fixes, better support for subresources, etc.
  ........
    r766308 | tilladam | 2008-01-25 20:48:22 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Add missing files.
  ........
    r766309 | tilladam | 2008-01-25 20:53:07 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge in the aggregated alarm view from enterprise branch.
  ........
    r766312 | tilladam | 2008-01-25 20:59:58 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Port interface extensions from enterprise branch.
  ........
    r766343 | tilladam | 2008-01-25 21:48:41 +0530 (Fri, 25 Jan 2008) | 3 lines
    
    Merge in the complete revamped event editor, the timeline view, support
    for extended free busy, etc from enterprise branch.
  ........
    r766346 | tilladam | 2008-01-25 22:00:36 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Fix compilation.
  ........
    r766347 | tilladam | 2008-01-25 22:06:07 +0530 (Fri, 25 Jan 2008) | 3 lines
    
    Fix the unit tests, and add a new one for xfb, from enterprise
    branch.
  ........
    r766349 | tilladam | 2008-01-25 22:15:00 +0530 (Fri, 25 Jan 2008) | 3 lines
    
    Merge in size column support, many, many fixes to the addressee completion,
    korganizer compilation, etc.
  ........
    r766352 | vkrause | 2008-01-25 22:27:31 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge test fixes from enterprise branch.
  ........
    r766353 | vkrause | 2008-01-25 22:29:37 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    SVN_SILENT Add missing file.
  ........
    r766360 | vkrause | 2008-01-25 22:46:02 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    SVN_SILENT fix encoding
  ........
    r766364 | vkrause | 2008-01-25 22:53:31 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge documentation from enterprise branch (except the chiasmus docs).
  ........
    r766368 | pradeepto | 2008-01-25 22:58:51 +0530 (Fri, 25 Jan 2008) | 2 lines
    
     -- Merging in certmanager stuff from enterprise. (Marc has reviewed the diff.)
  ........
    r766369 | ahartmetz | 2008-01-25 23:03:10 +0530 (Fri, 25 Jan 2008) | 1 line
    
    Merge from the enterprise branch. The summary is "bits and pieces" - mostly user \
                interface improvements.
  ........
    r766370 | vkrause | 2008-01-25 23:03:21 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    SVN_SILENT fix encoding
  ........
    r766378 | vkrause | 2008-01-25 23:27:47 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge support for gnupg audit logs from enterprise branch.
  ........
    r766380 | vkrause | 2008-01-25 23:35:35 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    SVN_SILENT add missing files
  ........
    r766386 | tilladam | 2008-01-25 23:40:55 +0530 (Fri, 25 Jan 2008) | 2 lines
    
    Merge in API extension from enterprise branch.
  ........
    r766388 | tilladam | 2008-01-25 23:41:51 +0530 (Fri, 25 Jan 2008) | 3 lines
    
    Merge optional support for ';' as an email separator from
    enterprise.
  ........
    r766401 | ahartmetz | 2008-01-26 00:12:14 +0530 (Sat, 26 Jan 2008) | 1 line
    
    Merge from enterprise: move printing functionality into a separate class \
                KNotePrinter
  ........
    r766416 | vkrause | 2008-01-26 01:32:56 +0530 (Sat, 26 Jan 2008) | 2 lines
    
    SVN_SILENT add missing file
  ........
    r766428 | vkrause | 2008-01-26 02:04:26 +0530 (Sat, 26 Jan 2008) | 3 lines
    
    SVN_SILENT merge trivial changes from enterpise branch (whitespaces,
    style changes, etc.)
  ........
    r766430 | vkrause | 2008-01-26 02:10:19 +0530 (Sat, 26 Jan 2008) | 2 lines
    
    remove unused code (merge from enterprise branch)
  ........
................
  r766781 | pradeepto | 2008-01-26 17:24:13 +0100 (Sat, 26 Jan 2008) | 1 line
  
  Missing .desktop information for kaddressbook distlistng
................
  r766783 | pradeepto | 2008-01-26 17:31:07 +0100 (Sat, 26 Jan 2008) | 1 line
  
  fix more encoding
................
  r766790 | tilladam | 2008-01-26 17:54:18 +0100 (Sat, 26 Jan 2008) | 15 lines
  
  Merged revisions 639750 via svnmerge from 
  svn+ssh://tilladam@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r639750 | winterz | 2007-03-05 23:25:33 +0100 (Mon, 05 Mar 2007) | 8 lines
    
    merge SVN commit 633860 by adridg:
    
    When the message is set to a composer with a specific cursor position,
    (ie. not 0, eg. from a template containing %CURSOR) then don't reset the
    cursor position when appending the signature. This makes it possible
    to use %CURSOR to place the cursor anywhere in a template. Useful
    for reply templates, at any rate.
  ........
................
  r766832 | tilladam | 2008-01-26 19:51:08 +0100 (Sat, 26 Jan 2008) | 2 lines
  
  Build.
................
  r766835 | tilladam | 2008-01-26 20:04:35 +0100 (Sat, 26 Jan 2008) | 9 lines
  
  Blocked revisions 766717 via svnmerge
  
  ........
    r766717 | tilladam | 2008-01-26 15:05:10 +0100 (Sat, 26 Jan 2008) | 3 lines
    
    Merge immediate sync on resource change and support for scalix into
    the kmail side of the imap resource.
  ........
................
  r766837 | tilladam | 2008-01-26 20:11:25 +0100 (Sat, 26 Jan 2008) | 51 lines
  
  Blocked revisions 766728,766733,766744,766751,766754-766755,766771,766780,766791-766792,766796 \
via svnmerge  
  ........
    r766728 | tilladam | 2008-01-26 15:33:55 +0100 (Sat, 26 Jan 2008) | 2 lines
    
    Merge in check for inotify from enterprise branch.
  ........
    r766733 | tilladam | 2008-01-26 15:44:29 +0100 (Sat, 26 Jan 2008) | 4 lines
    
    Merge in the new files from enterprise branch, roughly:
    attachment editing from the composer, favourite folders view, support
    for snippets in the composer, filter import and export, scalix support.
  ........
    r766744 | tilladam | 2008-01-26 15:53:45 +0100 (Sat, 26 Jan 2008) | 2 lines
    
    Merge build system changes and new graphics for the new header style from \
                enterprise branch.
  ........
    r766751 | tilladam | 2008-01-26 16:04:46 +0100 (Sat, 26 Jan 2008) | 2 lines
    
    Merge tests build system changes and util function from enterprise branch.
  ........
    r766754 | tilladam | 2008-01-26 16:06:15 +0100 (Sat, 26 Jan 2008) | 2 lines
    
    Hook in the enterprise imagery.
  ........
    r766755 | tilladam | 2008-01-26 16:11:47 +0100 (Sat, 26 Jan 2008) | 2 lines
    
    Merge documentation updates from enterprise branch.
  ........
    r766771 | pradeepto | 2008-01-26 16:54:01 +0100 (Sat, 26 Jan 2008) | 2 lines
    
     -- merging .desktop file for kresources/scalix.
  ........
    r766780 | pradeepto | 2008-01-26 17:15:18 +0100 (Sat, 26 Jan 2008) | 1 line
    
    missing German .desktop entry
  ........
    r766791 | pradeepto | 2008-01-26 17:57:17 +0100 (Sat, 26 Jan 2008) | 2 lines
    
     -- Merging from enterprise
  ........
    r766792 | tilladam | 2008-01-26 17:58:04 +0100 (Sat, 26 Jan 2008) | 3 lines
    
    Merge in the rest of enterprise branch. Manually reviewed. I'll make a wiki page
    of all the changes, they are too numerous to list here.
  ........
    r766796 | pradeepto | 2008-01-26 18:12:39 +0100 (Sat, 26 Jan 2008) | 1 line
    
    compile++
  ........
................
  r767027 | pradeepto | 2008-01-27 10:24:07 +0100 (Sun, 27 Jan 2008) | 9 lines
  
  Merged revisions 766849 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r766849 | djarvie | 2008-01-27 01:06:26 +0530 (Sun, 27 Jan 2008) | 1 line
    
    Formatting
  ........
................
  r767030 | pradeepto | 2008-01-27 10:42:25 +0100 (Sun, 27 Jan 2008) | 13 lines
  
  Merged revisions 766743,766745 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r766743 | woebbe | 2008-01-26 20:22:22 +0530 (Sat, 26 Jan 2008) | 1 line
    
    -pedantic
  ........
    r766745 | djarvie | 2008-01-26 20:24:05 +0530 (Sat, 26 Jan 2008) | 1 line
    
    Clear sub-repetition when recurrence is cleared
  ........
................
  r767041 | pradeepto | 2008-01-27 11:15:21 +0100 (Sun, 27 Jan 2008) | 21 lines
  
  Blocked revisions 766900,767022 via svnmerge
  
  ........
    r766900 | kloecker | 2008-01-27 03:10:26 +0530 (Sun, 27 Jan 2008) | 6 lines
    
    Merged revision 766899 from the enterprise branch
    
    Added a queuing mechanism to prevent several KDirSize jobs from running \
concurrently when several maildir folders are checked for their size.  
    CCBUGS: 149414
  ........
    r767022 | tilladam | 2008-01-27 14:16:14 +0530 (Sun, 27 Jan 2008) | 7 lines
    
    Final bit of the enterprise branch merge:
    - support for kontact wide profiles
    - coordinated sync actions across parts
    - up the version number, since the interface changed
    - support for printing in the knotes part
    - more consisten naming of parts/components/plugins etc across the whole UI
  ........
................
  r767047 | pradeepto | 2008-01-27 12:00:46 +0100 (Sun, 27 Jan 2008) | 10 lines
  
  SVN_SILENT
  Merged revisions 767046 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r767046 | pradeepto | 2008-01-27 16:20:04 +0530 (Sun, 27 Jan 2008) | 2 lines
    
     -- Adding the .de entries in .desktop files. Wonder what scripty had against \
                them? ;)
  ........
................
  r767552 | pradeepto | 2008-01-28 11:28:11 +0100 (Mon, 28 Jan 2008) | 9 lines
  
  Merged revisions 767393 via svnmerge from 
  svn+ssh://pradeepto@svn.kde.org/home/kde/branches/KDE/3.5/kdepim
  
  ........
    r767393 | djarvie | 2008-01-28 04:10:05 +0530 (Mon, 28 Jan 2008) | 2 lines
    
    Fix minimum value set in sub-repetition dialog after recurrence type change
  ........
................
  r767555 | pradeepto | 2008-01-28 11:30:27 +0100 (Mon, 28 Jan 2008) | 2 lines
  
   - Updating the change log.
................
  r767557 | pradeepto | 2008-01-28 11:34:35 +0100 (Mon, 28 Jan 2008) | 2 lines
  
   - version bump
................


 _M            . (directory)  


** trunk/KDE/kdepim #property svnmerge-blocked
   - /branches/kdepim/enterprise/kdepim:709145,709403,709405,709412,709432,709473,7094 \
79,709488,709851,710563,710565,710635,710642,710644,711040,711165,711601,711781,712274 \
,714101,715218,717295,724382,724385,724444,728090,728451,729581-729582,731334,731670,7 \
31720,731868,731871,732023,734537,734581,734583-734585,734592,736243,736315,737484,737 \
490-737491,737496,740442,740447,740460,740472,744693,744708,759132,761116,761119,76112 \
4,761128-761130,761132-761133,761135-761136,761138,761142-761143,761146,761148,761231, \
761241,761245,761331,761335,761338,761375,761534,761536,761538,761547,761551,761554,76 \
1557,761560,761562,761565,761571,761573,761581,761602,761621,761896,761901,762899,7629 \
05,762908-762909,762922,762989,763016,763038-763039,763521,764288,764583,764601,764605,764628,764630,764680,764683
  + /branches/kdepim/enterprise/kdepim:709145,709403,709405,709412,709432,709473,70947 \
9,709488,709851,710563,710565,710635,710642,710644,711040,711165,711601,711781,712274, \
714101,715218,717295,724382,724385,724444,728090,728451,729581-729582,731334,731670,73 \
1720,731868,731871,732023,734537,734581,734583-734585,734592,736243,736315,737484,7374 \
90-737491,737496,740442,740447,740460,740472,744693,744708,759132,761116,761119,761124 \
,761128-761130,761132-761133,761135-761136,761138,761142-761143,761146,761148,761231,7 \
61241,761245,761331,761335,761338,761375,761534,761536,761538,761547,761551,761554,761 \
557,761560,761562,761565,761571,761573,761581,761602,761621,761896,761901,762899,76290 \
5,762908-762909,762922,762989,763016,763038-763039,763521,764288,764583,764601,764605, \
764628,764630,764680,764683,764822,764850,764876,765074-765075,765080,765083,765132,76 \
5141-765142,765144,765224,765226-765227,765230,765311,765320,765323,765330,765335,765338,765342-765345,765350,765363-765368,76538
  0,765382,765384,765578,765746,765750,765755-765756,765761,765763,765766,765768,76577 \
0-765772,765775-765776,765779,765785-765788,765791,765804,765853,766057,766086,766090, \
766094-766095,766121,766140,766218,766233,766247,766267,766279,766288,766345,766357,76 \
6367,766371,766374,766389,766421,766539,766781,766783,766790,766832,766835,766837,767027,767030,767041,767047,767552,767555,767557



[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic