From kde-commits  Tue Sep 30 22:52:11 2014
From: David Jarvie <djarvie () kde ! org>
Date: Tue, 30 Sep 2014 22:52:11 +0000
To: kde-commits
Subject: [kdepim] kalarm: Merge commit 'f3475b99ef5ff0b4224a770d0d5e98ee511b1fed'
Message-Id: <E1XZ6HD-0003tD-Uq () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=141211754013607

Git commit 33984d5717bf916d693991bde5445bcab192aaff by David Jarvie.
Committed on 30/09/2014 at 22:54.
Pushed by djarvie into branch 'master'.

Merge commit 'f3475b99ef5ff0b4224a770d0d5e98ee511b1fed'

M  +1    -1    kalarm/kalarm.h

http://commits.kde.org/kdepim/33984d5717bf916d693991bde5445bcab192aaff

diff --cc kalarm/kalarm.h
index 8d3e752,7268018..7cadf3c
--- a/kalarm/kalarm.h
+++ b/kalarm/kalarm.h
@@@ -23,8 -23,12 +23,8 @@@
  =

  #undef QT3_SUPPORT
  =

 -#ifdef USE_AKONADI
  #define VERSION_SUFFIX "-ak"
- #define KALARM_VERSION "2.10.11" VERSION_SUFFIX
 -#else
 -#define VERSION_SUFFIX "-res"
 -#endif
+ #define KALARM_VERSION "2.10.12" VERSION_SUFFIX
  =

  #define KALARM_NAME "KAlarm"
  #define KALARM_DBUS_SERVICE  "org.kde.kalarm"  // D-Bus service name of K=
Alarm application