--- a/switch-to-experimental.diff Thu Oct 18 15:36:16 2012 +0300
+++ b/switch-to-experimental.diff Thu Oct 18 21:54:26 2012 +0300
@@ -1,9 +1,9 @@
[local] Switch to experimental branch and api version
-diff -r 5f699ebd8af1 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api Thu Oct 18 13:39:25 2012 +0300
-+++ b/mcabber/ChangeLog.api Thu Oct 18 13:43:08 2012 +0300
-@@ -1,9 +1,27 @@
+diff -r 84ad372d8137 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api Thu Oct 18 21:48:49 2012 +0300
++++ b/mcabber/ChangeLog.api Thu Oct 18 21:48:54 2012 +0300
+@@ -1,3 +1,12 @@
+experimental (37)
+
+ * Change branch to "experimental".
@@ -15,7 +15,8 @@
+
dev (24)
* MQ patch completion-sorting.diff
- * Add compl_set_flags() function
+ * Change compl_add_category() to accept flags arg
+@@ -5,6 +14,15 @@
-- Myhailo Danylenko, 2012-10-18
@@ -31,7 +32,7 @@
dev (23)
* Changeset 8dc418af3e72
Add buddy_(get|set)activeresource() functions
-@@ -22,6 +40,12 @@
+@@ -23,6 +41,12 @@
-- Hermitifier, 2011-10-03
@@ -44,9 +45,9 @@
dev (20)
* Add cmd_set_safe() and cmd_is_safe()
-diff -r 5f699ebd8af1 mcabber/configure.ac
---- a/mcabber/configure.ac Thu Oct 18 13:39:25 2012 +0300
-+++ b/mcabber/configure.ac Thu Oct 18 13:43:08 2012 +0300
+diff -r 84ad372d8137 mcabber/configure.ac
+--- a/mcabber/configure.ac Thu Oct 18 21:48:49 2012 +0300
++++ b/mcabber/configure.ac Thu Oct 18 21:48:54 2012 +0300
@@ -272,7 +272,7 @@
AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
@@ -56,20 +57,20 @@
AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
# We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r 5f699ebd8af1 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h Thu Oct 18 13:39:25 2012 +0300
-+++ b/mcabber/mcabber/api.h Thu Oct 18 13:43:08 2012 +0300
-@@ -3,10 +3,10 @@
-
+diff -r 84ad372d8137 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h Thu Oct 18 21:48:49 2012 +0300
++++ b/mcabber/mcabber/api.h Thu Oct 18 21:48:54 2012 +0300
+@@ -4,10 +4,10 @@
+ #include <glib.h>
#include <mcabber/config.h> // For MCABBER_BRANCH
-#define MCABBER_API_VERSION 24
--#define MCABBER_API_MIN 21
+-#define MCABBER_API_MIN 24
+#define MCABBER_API_VERSION 37
+#define MCABBER_API_MIN 37
-#define MCABBER_BRANCH_DEV 1
+#define MCABBER_BRANCH_EXPERIMENTAL 1
+ // cmd_add returns gpointer id
#define MCABBER_API_HAVE_CMD_ID 1
- #define MCABBER_API_HAVE_COMPL_FLAGS 1