switch-to-experimental
changeset 26 65d81aec6691
parent 24 7bb7fb2c1822
child 29 335662766a88
--- a/switch-to-experimental	Tue May 01 02:07:34 2012 +0300
+++ b/switch-to-experimental	Tue May 01 02:09:34 2012 +0300
@@ -1,22 +1,36 @@
-diff -r 62ebcecd524e mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Sun Jul 17 23:26:28 2011 +0300
-+++ b/mcabber/ChangeLog.api	Sun Jul 17 23:26:29 2011 +0300
-@@ -1,3 +1,12 @@
-+experimental (34)
+diff -r bd387d7410d0 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Mon Apr 30 23:21:22 2012 +0300
++++ b/mcabber/ChangeLog.api	Mon Apr 30 23:36:31 2012 +0300
+@@ -1,3 +1,13 @@
++
++experimental (35)
 +
 + * Change branch to "experimental".
-+ * Api as defined by dev:20
++ * Api as defined by dev:23
 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h
 + * MQ Patch: switch-to-experimental
 +
-+  -- Myhailo Danylenko, 2010-04-01
++  -- Myhailo Danylenko, 2012-04-30
++
+ dev (23)
+  * Changeset 8dc418af3e72
+    Add buddy_(get|set)activeresource() functions
+@@ -16,6 +26,12 @@
+ 
+   -- Hermitifier, 2011-10-03
+ 
++experimental (34)
++
++ * Api as defined by dev:20
++
++  -- Myhailo Danylenko, 2011-06-01
 +
  dev (20)
  
   * Add cmd_set_safe() and cmd_is_safe()
-diff -r 62ebcecd524e mcabber/configure.ac
---- a/mcabber/configure.ac	Sun Jul 17 23:26:28 2011 +0300
-+++ b/mcabber/configure.ac	Sun Jul 17 23:26:29 2011 +0300
+diff -r bd387d7410d0 mcabber/configure.ac
+--- a/mcabber/configure.ac	Mon Apr 30 23:21:22 2012 +0300
++++ b/mcabber/configure.ac	Mon Apr 30 23:36:31 2012 +0300
 @@ -272,7 +272,7 @@
  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
  
@@ -26,17 +40,17 @@
  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
  
  # We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r 62ebcecd524e mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Sun Jul 17 23:26:28 2011 +0300
-+++ b/mcabber/mcabber/api.h	Sun Jul 17 23:26:29 2011 +0300
+diff -r bd387d7410d0 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Mon Apr 30 23:21:22 2012 +0300
++++ b/mcabber/mcabber/api.h	Mon Apr 30 23:36:31 2012 +0300
 @@ -3,10 +3,10 @@
  
  #include <mcabber/config.h> // For MCABBER_BRANCH
  
--#define MCABBER_API_VERSION 20
--#define MCABBER_API_MIN     19
-+#define MCABBER_API_VERSION 34
-+#define MCABBER_API_MIN     34
+-#define MCABBER_API_VERSION 23
+-#define MCABBER_API_MIN     21
++#define MCABBER_API_VERSION 35
++#define MCABBER_API_MIN     35
  
 -#define MCABBER_BRANCH_DEV  1
 +#define MCABBER_BRANCH_EXPERIMENTAL 1