Sync with mcabber dev version
authorMikael Berthe <mikael@lilotux.net>
Sun, 27 Mar 2011 20:02:12 +0200
changeset 42 958051365a6e
parent 41 8f415b2e3851
child 43 751d06b00558
Sync with mcabber dev version
config.h.in
disco.c
--- 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
 
--- 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,