--- a/switch-to-experimental.diff Tue Nov 27 12:06:38 2012 +0200
+++ b/switch-to-experimental.diff Fri Nov 30 15:39:01 2012 +0200
@@ -1,9 +1,25 @@
[local] Switch to experimental branch and api version
-diff -r f83dee7bacc8 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Tue Nov 27 12:03:05 2012 +0200
-+++ b/mcabber/ChangeLog.api Tue Nov 27 12:03:13 2012 +0200
+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
@@ -1,3 +1,12 @@
++experimental (39)
++
++ * Change branch to "experimental".
++ * Api as defined by dev:25
++ * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
++ * MQ Patch: switch-to-experimental.diff
++
++ -- Myhailo Danylenko, 2012-11-30
++
+ dev (25)
+
+ * MQ patch record_dev25_in_changelog.diff
+@@ -5,6 +14,15 @@
+
+ -- Mikael Berthe, 2012-11-28
+
+experimental (37)
+
+ * Change branch to "experimental".
@@ -16,7 +32,7 @@
dev (24)
* Changeset 0cb8ea02e472
-@@ -7,6 +16,15 @@
+@@ -14,6 +32,15 @@
-- Myhailo Danylenko, 2012-10-20
@@ -32,7 +48,7 @@
dev (23)
* Changeset 8dc418af3e72
-@@ -28,6 +46,12 @@
+@@ -35,6 +62,12 @@
-- Hermitifier, 2011-10-03
@@ -45,9 +61,9 @@
dev (20)
* Add cmd_set_safe() and cmd_is_safe()
-diff -r f83dee7bacc8 mcabber/configure.ac
---- a/mcabber/configure.ac Tue Nov 27 12:03:05 2012 +0200
-+++ b/mcabber/configure.ac Tue Nov 27 12:03:13 2012 +0200
+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 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
@@ -57,17 +73,17 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r f83dee7bacc8 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Tue Nov 27 12:03:05 2012 +0200
-+++ b/mcabber/mcabber/api.h Tue Nov 27 12:03:13 2012 +0200
+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
@@ -4,10 +4,10 @@
#include <glib.h>
#include <mcabber/config.h> // For MCABBER_BRANCH
--#define MCABBER_API_VERSION 24
+-#define MCABBER_API_VERSION 25
-#define MCABBER_API_MIN 24
-+#define MCABBER_API_VERSION 37
-+#define MCABBER_API_MIN 37
++#define MCABBER_API_VERSION 39
++#define MCABBER_API_MIN 39
-#define MCABBER_BRANCH_DEV 1
+#define MCABBER_BRANCH_EXPERIMENTAL 1