# HG changeset patch
# User Mikael Berthe <mikael@lilotux.net>
# Date 1301248932 -7200
# Node ID 958051365a6e8df965334ec031dcd109bcd5241b
# Parent  8f415b2e38517f928cd540834ff9692a3bb232b3
Sync with mcabber dev version

diff -r 8f415b2e3851 -r 958051365a6e config.h.in
--- a/config.h.in	Sat Mar 26 15:31:44 2011 +0100
+++ b/config.h.in	Sun Mar 27 20:02:12 2011 +0200
@@ -6,7 +6,9 @@
 
 #include <mcabber/config.h>
 
-#if MCABBER_BRANCH_EXPERIMENTAL && MCABBER_API_VERSION >= 31
+#if MCABBER_BRANCH_EXPERIMENTAL && MCABBER_API_VERSION >= 34
+#  define HAVE_CMD_ID
+#elif MCABBER_BRANCH_DEV && MCABBER_API_VERSION >= 20
 #  define HAVE_CMD_ID
 #endif
 
diff -r 8f415b2e3851 -r 958051365a6e disco.c
--- a/disco.c	Sat Mar 26 15:31:44 2011 +0100
+++ b/disco.c	Sun Mar 27 20:02:12 2011 +0200
@@ -49,7 +49,7 @@
 
 static module_info_t info_disco_experimental = {
 	.branch      = "experimental",
-	.api         = 32,
+	.api         = 34,
 	.version     = PROJECT_VERSION,
 	.description = DESCRIPTION,
 	.requires    = NULL,
@@ -60,7 +60,7 @@
 
 static module_info_t info_disco_dev = {
 	.branch      = "dev",
-	.api         = 18,
+	.api         = 20,
 	.version     = PROJECT_VERSION,
 	.description = DESCRIPTION,
 	.requires    = NULL,