Skip to content
  • Volker Krause's avatar
    SVN_MERGE · 6c2f0947
    Volker Krause authored
    Merged revisions 1061287,1061289-1061290,1061294,1061299-1061301,1061344,1061354,1061369,1061374,1061383,1061455-1061458,1061460,1061463-1061464,1061467,1061471,1061473,1061480,1061516,1061635,1061724,1061729,1061732-1061733,1061910,1062015,1062065,1062071,1062097,1062129 via svnmerge from 
    https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim
    
    ........
      r1061287 | cgiboudeaux | 2009-12-11 11:46:54 +0100 (Fri, 11 Dec 2009) | 5 lines
      
      Move kpilot to tags/unmaintained/4
      
      ACKed by Bertjan
    ........
      r1061289 | cgiboudeaux | 2009-12-11 11:49:56 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Kpilot moved to unmaintained
    ........
      r1061290 | cgiboudeaux | 2009-12-11 11:50:40 +0100 (Fri, 11 Dec 2009) | 1 line
      
      cleanup
    ........
      r1061294 | cgiboudeaux | 2009-12-11 12:28:27 +0100 (Fri, 11 Dec 2009) | 8 lines
      
      Move Kitchensync to playground/pim
      
      ACKed by Tobias.
      
      Albert, can you move the translations please ?
      CCMAIL: tsdgeos@terra.es
    ........
      r1061299 | cgiboudeaux | 2009-12-11 12:38:16 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Move the kpilot doc to its new location.
    ........
      r1061300 | cgiboudeaux | 2009-12-11 12:38:57 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Remove kpilot
    ........
      r1061301 | cgiboudeaux | 2009-12-11 12:40:00 +0100 (Fri, 11 Dec 2009) | 2 lines
      
      cleanup
    ........
      r1061344 | nlecureuil | 2009-12-11 15:36:05 +0100 (Fri, 11 Dec 2009) | 4 lines
      
      Fix Knotes when used inside Kontact
      BUG:218002
      Reviewed: http://reviewboard.kde.org/r/2356/
    ........
      r1061354 | cgiboudeaux | 2009-12-11 16:00:27 +0100 (Fri, 11 Dec 2009) | 3 lines
      
      Move tvanytime to playground/pim
      ACKed by Will.
    ........
      r1061369 | tmcguire | 2009-12-11 16:22:16 +0100 (Fri, 11 Dec 2009) | 2 lines
      
      Remove duplicated implementation of getMsgBase() for Windows.
    ........
      r1061374 | cgiboudeaux | 2009-12-11 16:26:34 +0100 (Fri, 11 Dec 2009) | 1 line
      
      shareddesktopontologies is required if Nepomuk is found and not disabled.
    ........
      r1061383 | cgiboudeaux | 2009-12-11 16:49:49 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Remove the local copy of these ontologies.
    ........
      r1061455 | cgiboudeaux | 2009-12-11 20:21:45 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Require sharedDesktopOntologies in kdepim too.
    ........
      r1061456 | cgiboudeaux | 2009-12-11 20:23:21 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Only use sharedDesktopOntologies files.
    ........
      r1061457 | cgiboudeaux | 2009-12-11 20:24:09 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Bye bye *.rdfs
    ........
      r1061458 | cgiboudeaux | 2009-12-11 20:30:51 +0100 (Fri, 11 Dec 2009) | 1 line
      
      akonadi was renamed.
    ........
      r1061460 | cgiboudeaux | 2009-12-11 20:34:06 +0100 (Fri, 11 Dec 2009) | 1 line
      
      No need to include this directory twice.
    ........
      r1061463 | cgiboudeaux | 2009-12-11 20:47:36 +0100 (Fri, 11 Dec 2009) | 1 line
      
      akonadi -> runtime
    ........
      r1061464 | cgiboudeaux | 2009-12-11 20:53:11 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Comment akonalendar. kcalmodel.h doesn't seem to exist in trunk.
    ........
      r1061467 | cgiboudeaux | 2009-12-11 20:58:55 +0100 (Fri, 11 Dec 2009) | 1 line
      
      -Wmissing-include-dirs
    ........
      r1061471 | cgiboudeaux | 2009-12-11 21:12:04 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Comment for now.
    ........
      r1061473 | cgiboudeaux | 2009-12-11 21:15:25 +0100 (Fri, 11 Dec 2009) | 1 line
      
      SVN_SILENT Disambiguate the macro_log_message.
    ........
      r1061480 | cgiboudeaux | 2009-12-11 21:39:51 +0100 (Fri, 11 Dec 2009) | 1 line
      
      Comment for the moment.
    ........
      r1061516 | cgiboudeaux | 2009-12-12 00:16:05 +0100 (Sat, 12 Dec 2009) | 1 line
      
      Fix the nepomuk_email_feeder compilation
    ........
      r1061635 | mlaurent | 2009-12-12 16:10:19 +0100 (Sat, 12 Dec 2009) | 2 lines
      
      add missing i18n
    ........
      r1061724 | reitelbach | 2009-12-12 21:23:33 +0100 (Sat, 12 Dec 2009) | 4 lines
      
      Typo fix --contact
      
      CCMAIL:kde-i18n-doc@kde.org
    ........
      r1061729 | cgiboudeaux | 2009-12-12 21:42:19 +0100 (Sat, 12 Dec 2009) | 1 line
      
      enable akonadi, akonadiconsole and akonalendar again.
    ........
      r1061732 | cgiboudeaux | 2009-12-12 21:59:15 +0100 (Sat, 12 Dec 2009) | 1 line
      
      SVN_SILENT not necessary in this directory.
    ........
      r1061733 | cgiboudeaux | 2009-12-12 22:03:38 +0100 (Sat, 12 Dec 2009) | 1 line
      
      SVN_SILENT more unneeded files removed.
    ........
      r1061910 | scripty | 2009-12-13 11:18:41 +0100 (Sun, 13 Dec 2009) | 1 line
      
      SVN_SILENT made messages (.desktop file)
    ........
      r1062015 | segato | 2009-12-13 16:11:18 +0100 (Sun, 13 Dec 2009) | 1 line
      
      include boost dir too
    ........
      r1062065 | cgiboudeaux | 2009-12-13 18:36:17 +0100 (Sun, 13 Dec 2009) | 1 line
      
      The mailreader test app. doesn't need kdepim-runtime to build.
    ........
      r1062071 | cgiboudeaux | 2009-12-13 18:58:00 +0100 (Sun, 13 Dec 2009) | 6 lines
      
      Add a new option KDEPIM_BUILD_EXAMPLES. default = disabled.
      This way, the kdepim example apps will not be packaged.
      
      CCMAIL: kde-pim@kde.org
    ........
      r1062097 | cgiboudeaux | 2009-12-13 20:50:05 +0100 (Sun, 13 Dec 2009) | 1 line
      
      SVN_SILENT KDE4_ -> KDEPIMLIBS_
    ........
      r1062129 | uwolfer | 2009-12-13 22:35:03 +0100 (Sun, 13 Dec 2009) | 2 lines
      
      optimizegraphics: Losslessly optimized PNG and SVGZ files with "optipng -o5" and "advdef -z -4".
      Reduced disk space: 2524KB (2MB)
    ........
    
    svn path=/branches/work/akonadi-ports/kdepim/; revision=1062647
    6c2f0947