--- a/switch-to-experimental.diff Wed May 15 13:32:42 2013 +0300
+++ b/switch-to-experimental.diff Wed Nov 12 23:04:36 2014 +0200
@@ -1,9 +1,25 @@
[local] Switch to experimental branch and api version
-diff -r 6dca189957d2 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Wed May 15 12:48:53 2013 +0300
-+++ b/mcabber/ChangeLog.api Wed May 15 12:52:07 2013 +0300
+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
@@ -1,3 +1,12 @@
++experimental (43)
++
++ * Change branch to "experimental".
++ * Api as defined by dev:26
++ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
++ * MQ Patch: switch-to-experimental.diff
++
++ -- Myhailo Danylenko, 2014-11-11
++
+ dev (36)
+
+ * process_command() does not return value
+@@ -87,6 +96,15 @@
+
+ -- Mikael Berthe, 2013-09-29
+
+experimental (41)
+
+ * Change branch to "experimental".
@@ -16,7 +32,7 @@
dev (26)
* Changeset 69699ba3010f
-@@ -7,6 +16,15 @@
+@@ -96,6 +114,15 @@
-- Mikael Berthe, 2013-04-28
@@ -32,7 +48,7 @@
dev (25)
* Stable api 0.10.2:1
-@@ -15,6 +33,15 @@
+@@ -104,6 +131,15 @@
-- Mikael Berthe, 2012-11-28
@@ -48,7 +64,7 @@
dev (24)
* Changeset 0cb8ea02e472
-@@ -24,6 +51,15 @@
+@@ -113,6 +149,15 @@
-- Myhailo Danylenko, 2012-10-20
@@ -64,7 +80,7 @@
dev (23)
* Changeset 8dc418af3e72
-@@ -45,6 +81,12 @@
+@@ -134,6 +179,12 @@
-- Hermitifier, 2011-10-03
@@ -77,10 +93,10 @@
dev (20)
* Add cmd_set_safe() and cmd_is_safe()
-diff -r 6dca189957d2 mcabber/configure.ac
---- a/mcabber/configure.ac Wed May 15 12:48:53 2013 +0300
-+++ b/mcabber/configure.ac Wed May 15 12:52:07 2013 +0300
-@@ -281,7 +281,7 @@
+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
+@@ -284,7 +284,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
# Prepare some config.h variables
@@ -89,20 +105,19 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r 6dca189957d2 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Wed May 15 12:48:53 2013 +0300
-+++ b/mcabber/mcabber/api.h Wed May 15 12:52:07 2013 +0300
+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
@@ -4,10 +4,10 @@
#include <glib.h>
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 26
--#define MCABBER_API_MIN 24
--
+-#define MCABBER_API_VERSION 36
+-#define MCABBER_API_MIN 36
++#define MCABBER_API_VERSION 43
++#define MCABBER_API_MIN 43
+
-#define MCABBER_BRANCH_DEV 1
-+#define MCABBER_API_VERSION 41
-+#define MCABBER_API_MIN 41
-+
+#define MCABBER_BRANCH_EXPERIMENTAL 1
// cmd_add returns gpointer id