1 [local] Switch to experimental branch and api version |
1 [local] Switch to experimental branch and api version |
2 |
2 |
3 diff -r bd387d7410d0 mcabber/ChangeLog.api |
3 diff -r 4eb2d00128c5 mcabber/ChangeLog.api |
4 --- a/mcabber/ChangeLog.api Mon Apr 30 23:21:22 2012 +0300 |
4 --- a/mcabber/ChangeLog.api Tue Jul 31 23:59:24 2012 +0300 |
5 +++ b/mcabber/ChangeLog.api Mon Apr 30 23:36:31 2012 +0300 |
5 +++ b/mcabber/ChangeLog.api Wed Aug 01 00:02:04 2012 +0300 |
6 @@ -1,3 +1,13 @@ |
6 @@ -1,3 +1,13 @@ |
7 + |
7 + |
8 +experimental (35) |
8 +experimental (36) |
9 + |
9 + |
10 + * Change branch to "experimental". |
10 + * Change branch to "experimental". |
11 + * Api as defined by dev:23 |
11 + * Api as defined by dev:24 |
12 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
12 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
13 + * MQ Patch: switch-to-experimental |
13 + * MQ Patch: switch-to-experimental |
14 + |
14 + |
15 + -- Myhailo Danylenko, 2012-04-30 |
15 + -- Myhailo Danylenko, 2012-04-30 |
16 + |
16 + |
17 dev (23) |
17 dev (24) |
18 * Changeset 8dc418af3e72 |
18 * experimental patch add-offline-message |
19 Add buddy_(get|set)activeresource() functions |
19 * xmpp_disconnect now accepts status message |
20 @@ -16,6 +26,12 @@ |
20 @@ -22,6 +32,12 @@ |
21 |
21 |
22 -- Hermitifier, 2011-10-03 |
22 -- Hermitifier, 2011-10-03 |
23 |
23 |
24 +experimental (34) |
24 +experimental (34) |
25 + |
25 + |
28 + -- Myhailo Danylenko, 2011-06-01 |
28 + -- Myhailo Danylenko, 2011-06-01 |
29 + |
29 + |
30 dev (20) |
30 dev (20) |
31 |
31 |
32 * Add cmd_set_safe() and cmd_is_safe() |
32 * Add cmd_set_safe() and cmd_is_safe() |
33 diff -r bd387d7410d0 mcabber/configure.ac |
33 diff -r 4eb2d00128c5 mcabber/configure.ac |
34 --- a/mcabber/configure.ac Mon Apr 30 23:21:22 2012 +0300 |
34 --- a/mcabber/configure.ac Tue Jul 31 23:59:24 2012 +0300 |
35 +++ b/mcabber/configure.ac Mon Apr 30 23:36:31 2012 +0300 |
35 +++ b/mcabber/configure.ac Wed Aug 01 00:02:04 2012 +0300 |
36 @@ -272,7 +272,7 @@ |
36 @@ -272,7 +272,7 @@ |
37 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
37 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
38 |
38 |
39 # Prepare some config.h variables |
39 # Prepare some config.h variables |
40 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
40 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
41 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
41 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
42 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
42 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
43 |
43 |
44 # We need _GNU_SOURCE for strptime() and strcasestr() |
44 # We need _GNU_SOURCE for strptime() and strcasestr() |
45 diff -r bd387d7410d0 mcabber/mcabber/api.h |
45 diff -r 4eb2d00128c5 mcabber/mcabber/api.h |
46 --- a/mcabber/mcabber/api.h Mon Apr 30 23:21:22 2012 +0300 |
46 --- a/mcabber/mcabber/api.h Tue Jul 31 23:59:24 2012 +0300 |
47 +++ b/mcabber/mcabber/api.h Mon Apr 30 23:36:31 2012 +0300 |
47 +++ b/mcabber/mcabber/api.h Wed Aug 01 00:02:04 2012 +0300 |
48 @@ -3,10 +3,10 @@ |
48 @@ -3,10 +3,10 @@ |
49 |
49 |
50 #include <mcabber/config.h> // For MCABBER_BRANCH |
50 #include <mcabber/config.h> // For MCABBER_BRANCH |
51 |
51 |
52 -#define MCABBER_API_VERSION 23 |
52 -#define MCABBER_API_VERSION 24 |
53 -#define MCABBER_API_MIN 21 |
53 -#define MCABBER_API_MIN 24 |
54 +#define MCABBER_API_VERSION 35 |
54 +#define MCABBER_API_VERSION 36 |
55 +#define MCABBER_API_MIN 35 |
55 +#define MCABBER_API_MIN 36 |
56 |
56 |
57 -#define MCABBER_BRANCH_DEV 1 |
57 -#define MCABBER_BRANCH_DEV 1 |
58 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
58 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
59 |
59 |
60 #define MCABBER_API_HAVE_CMD_ID 1 |
60 #define MCABBER_API_HAVE_CMD_ID 1 |