Home GnuPG

SVN_MERGE
c81e26294b71Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

SVN_MERGE

Merged revisions 1015054,1015068-1015069,1015131,1015136,1015169,1015183 via svnmerge from
https://vkrause@svn.kde.org/home/kde/trunk/KDE/kdepim

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

r1015054 | scripty | 2009-08-24 14:17:52 +0200 (Mon, 24 Aug 2009) | 1 line

SVN_SILENT made messages (.desktop file)

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

r1015068 | winterz | 2009-08-24 14:28:30 +0200 (Mon, 24 Aug 2009) | 10 lines

merge r1014915 | vkrause | 2009-08-24 04:57:14 -0400 (Mon, 24 Aug 2009)

Unbreak LDAP completion.

This reverts revisions 951431 and 951433 and adds a different fix for
Kolab issue 1996 instead.

Kolab issue 3359

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

r1015069 | winterz | 2009-08-24 14:30:28 +0200 (Mon, 24 Aug 2009) | 21 lines

Recorded merge of revisions 1015047 via svnmerge from 
https://svn.kde.org/home/kde/branches/kdepim/enterprise4/kdepim

................
  r1015047 | winterz | 2009-08-24 08:06:46 -0400 (Mon, 24 Aug 2009) | 14 lines

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

  ........
    r1014915 | vkrause | 2009-08-24 04:57:14 -0400 (Mon, 24 Aug 2009) | 7 lines

    Unbreak LDAP completion.

    This reverts revisions 951431 and 951433 and adds a different fix for
    Kolab issue 1996 instead.

    Kolab issue 3359
  ........
................

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

r1015131 | tokoe | 2009-08-24 17:47:06 +0200 (Mon, 24 Aug 2009) | 2 lines

deprecated--

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

r1015136 | jbendig | 2009-08-24 18:08:20 +0200 (Mon, 24 Aug 2009) | 2 lines

Moved icons and sender/receiver column settings from General to View tab in the folder Properties dialog.

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

r1015169 | annma | 2009-08-24 20:49:11 +0200 (Mon, 24 Aug 2009) | 3 lines

fix messages according to discussion on IRC. Previous messages lead to bad translations. Let me know if it's all OK with you, translators!
CCMAIL=kde-i18n-doc@kde.org

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

r1015183 | winterz | 2009-08-24 21:53:28 +0200 (Mon, 24 Aug 2009) | 5 lines

use the cmake variable ${KDEPIMLIBS_AKONADI_LIBS}
instead of hardcoding "akonadi-kde" as the library name.

http://reviewboard.kde.org/r/1338

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

svn path=/branches/work/akonadi-ports/kdepim/; revision=1015293

Details

Event Timeline

Volker Krause <vkrause@kde.org> committed rKLEOPATRAc81e26294b71: SVN_MERGE (authored by Volker Krause <vkrause@kde.org>).Aug 25 2009, 9:44 AM