diff -r 78238d26911a -r 0a87df8ad9c1 switch-to-experimental.diff --- a/switch-to-experimental.diff Wed Nov 12 23:04:36 2014 +0200 +++ b/switch-to-experimental.diff Sat Nov 07 17:39:49 2015 +0200 @@ -1,13 +1,31 @@ +# HG changeset patch +# Parent b47f104be890171410d9eae72a90508a162cb836 [local] Switch to experimental branch and api version -diff -r a466d2a1ca15 mcabber/ChangeLog.api ---- a/mcabber/ChangeLog.api Wed Nov 12 00:15:59 2014 +0200 -+++ b/mcabber/ChangeLog.api Wed Nov 12 00:16:06 2014 +0200 +diff -r b47f104be890 mcabber/ChangeLog.api +--- a/mcabber/ChangeLog.api Sat Nov 07 14:22:58 2015 +0200 ++++ b/mcabber/ChangeLog.api Sat Nov 07 14:55:06 2015 +0200 @@ -1,3 +1,12 @@ ++experimental (45) ++ ++ * Change branch to "experimental". ++ * Api as defined by dev:41 ++ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h ++ * MQ Patch: switch-to-experimental.diff ++ ++ -- Myhailo Danylenko, 2015-11-07 ++ + dev (41) + + * Change prototype of otr_send() +@@ -36,6 +45,15 @@ + + -- Mikael Berthe, 2015-10-04 + +experimental (43) + + * Change branch to "experimental". -+ * Api as defined by dev:26 ++ * Api as defined by dev:36 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h + * MQ Patch: switch-to-experimental.diff + @@ -15,8 +33,8 @@ + dev (36) - * process_command() does not return value -@@ -87,6 +96,15 @@ + * Change prototype of gpg_encrypt() +@@ -118,6 +136,15 @@ -- Mikael Berthe, 2013-09-29 @@ -32,7 +50,7 @@ dev (26) * Changeset 69699ba3010f -@@ -96,6 +114,15 @@ +@@ -127,6 +154,15 @@ -- Mikael Berthe, 2013-04-28 @@ -48,7 +66,7 @@ dev (25) * Stable api 0.10.2:1 -@@ -104,6 +131,15 @@ +@@ -135,6 +171,15 @@ -- Mikael Berthe, 2012-11-28 @@ -64,7 +82,7 @@ dev (24) * Changeset 0cb8ea02e472 -@@ -113,6 +149,15 @@ +@@ -144,6 +189,15 @@ -- Myhailo Danylenko, 2012-10-20 @@ -80,7 +98,7 @@ dev (23) * Changeset 8dc418af3e72 -@@ -134,6 +179,12 @@ +@@ -165,6 +219,12 @@ -- Hermitifier, 2011-10-03 @@ -93,9 +111,9 @@ dev (20) * Add cmd_set_safe() and cmd_is_safe() -diff -r a466d2a1ca15 mcabber/configure.ac ---- a/mcabber/configure.ac Wed Nov 12 00:15:59 2014 +0200 -+++ b/mcabber/configure.ac Wed Nov 12 00:16:06 2014 +0200 +diff -r b47f104be890 mcabber/configure.ac +--- a/mcabber/configure.ac Sat Nov 07 14:22:58 2015 +0200 ++++ b/mcabber/configure.ac Sat Nov 07 14:55:06 2015 +0200 @@ -284,7 +284,7 @@ AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) @@ -105,17 +123,17 @@ AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) # We need _GNU_SOURCE for strptime() and strcasestr() -diff -r a466d2a1ca15 mcabber/mcabber/api.h ---- a/mcabber/mcabber/api.h Wed Nov 12 00:15:59 2014 +0200 -+++ b/mcabber/mcabber/api.h Wed Nov 12 00:16:06 2014 +0200 +diff -r b47f104be890 mcabber/mcabber/api.h +--- a/mcabber/mcabber/api.h Sat Nov 07 14:22:58 2015 +0200 ++++ b/mcabber/mcabber/api.h Sat Nov 07 14:55:06 2015 +0200 @@ -4,10 +4,10 @@ #include #include // For MCABBER_BRANCH --#define MCABBER_API_VERSION 36 --#define MCABBER_API_MIN 36 -+#define MCABBER_API_VERSION 43 -+#define MCABBER_API_MIN 43 +-#define MCABBER_API_VERSION 41 +-#define MCABBER_API_MIN 41 ++#define MCABBER_API_VERSION 45 ++#define MCABBER_API_MIN 45 -#define MCABBER_BRANCH_DEV 1 +#define MCABBER_BRANCH_EXPERIMENTAL 1