--- a/switch-to-experimental.diff Sun Mar 24 00:59:26 2013 +0200
+++ b/switch-to-experimental.diff Wed May 15 13:07:05 2013 +0300
@@ -1,9 +1,25 @@
[local] Switch to experimental branch and api version
-diff -r dd8cbf58c62e mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Fri Nov 30 14:59:29 2012 +0200
-+++ b/mcabber/ChangeLog.api Fri Nov 30 15:00:22 2012 +0200
+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
@@ -1,3 +1,12 @@
++experimental (41)
++
++ * 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, 2012-11-30
++
+ dev (26)
+
+ * Changeset 69699ba3010f
+@@ -7,6 +16,15 @@
+
+ -- Mikael Berthe, 2013-04-28
+
+experimental (39)
+
+ * Change branch to "experimental".
@@ -15,8 +31,8 @@
+
dev (25)
- * MQ patch record_dev25_in_changelog.diff
-@@ -5,6 +14,15 @@
+ * Stable api 0.10.2:1
+@@ -15,6 +33,15 @@
-- Mikael Berthe, 2012-11-28
@@ -32,7 +48,7 @@
dev (24)
* Changeset 0cb8ea02e472
-@@ -14,6 +32,15 @@
+@@ -24,6 +51,15 @@
-- Myhailo Danylenko, 2012-10-20
@@ -48,7 +64,7 @@
dev (23)
* Changeset 8dc418af3e72
-@@ -35,6 +62,12 @@
+@@ -45,6 +81,12 @@
-- Hermitifier, 2011-10-03
@@ -61,10 +77,10 @@
dev (20)
* Add cmd_set_safe() and cmd_is_safe()
-diff -r dd8cbf58c62e mcabber/configure.ac
---- a/mcabber/configure.ac Fri Nov 30 14:59:29 2012 +0200
-+++ b/mcabber/configure.ac Fri Nov 30 15:00:22 2012 +0200
-@@ -272,7 +272,7 @@
+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 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
# Prepare some config.h variables
@@ -73,19 +89,20 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r dd8cbf58c62e mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Fri Nov 30 14:59:29 2012 +0200
-+++ b/mcabber/mcabber/api.h Fri Nov 30 15:00:22 2012 +0200
+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
@@ -4,10 +4,10 @@
#include <glib.h>
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 25
+-#define MCABBER_API_VERSION 26
-#define MCABBER_API_MIN 24
-+#define MCABBER_API_VERSION 39
-+#define MCABBER_API_MIN 39
-
+-
-#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