[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] kalarm: Merge commit 'f3475b99ef5ff0b4224a770d0d5e98ee511b1fed'
From: David Jarvie <djarvie () kde ! org>
Date: 2014-09-30 22:52:11
Message-ID: E1XZ6HD-0003tD-Uq () scm ! kde ! org
[Download RAW message or body]
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
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic