|
1 # HG changeset patch |
|
2 # Parent b47f104be890171410d9eae72a90508a162cb836 |
1 [local] Switch to experimental branch and api version |
3 [local] Switch to experimental branch and api version |
2 |
4 |
3 diff -r a466d2a1ca15 mcabber/ChangeLog.api |
5 diff -r b47f104be890 mcabber/ChangeLog.api |
4 --- a/mcabber/ChangeLog.api Wed Nov 12 00:15:59 2014 +0200 |
6 --- a/mcabber/ChangeLog.api Sat Nov 07 14:22:58 2015 +0200 |
5 +++ b/mcabber/ChangeLog.api Wed Nov 12 00:16:06 2014 +0200 |
7 +++ b/mcabber/ChangeLog.api Sat Nov 07 14:55:06 2015 +0200 |
6 @@ -1,3 +1,12 @@ |
8 @@ -1,3 +1,12 @@ |
|
9 +experimental (45) |
|
10 + |
|
11 + * Change branch to "experimental". |
|
12 + * Api as defined by dev:41 |
|
13 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
|
14 + * MQ Patch: switch-to-experimental.diff |
|
15 + |
|
16 + -- Myhailo Danylenko, 2015-11-07 |
|
17 + |
|
18 dev (41) |
|
19 |
|
20 * Change prototype of otr_send() |
|
21 @@ -36,6 +45,15 @@ |
|
22 |
|
23 -- Mikael Berthe, 2015-10-04 |
|
24 |
7 +experimental (43) |
25 +experimental (43) |
8 + |
26 + |
9 + * Change branch to "experimental". |
27 + * Change branch to "experimental". |
10 + * Api as defined by dev:26 |
28 + * Api as defined by dev:36 |
11 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
29 + * Add MCABBER_BRANCH_EXPERIMENTAL define to api.h |
12 + * MQ Patch: switch-to-experimental.diff |
30 + * MQ Patch: switch-to-experimental.diff |
13 + |
31 + |
14 + -- Myhailo Danylenko, 2014-11-11 |
32 + -- Myhailo Danylenko, 2014-11-11 |
15 + |
33 + |
16 dev (36) |
34 dev (36) |
17 |
35 |
18 * process_command() does not return value |
36 * Change prototype of gpg_encrypt() |
19 @@ -87,6 +96,15 @@ |
37 @@ -118,6 +136,15 @@ |
20 |
38 |
21 -- Mikael Berthe, 2013-09-29 |
39 -- Mikael Berthe, 2013-09-29 |
22 |
40 |
23 +experimental (41) |
41 +experimental (41) |
24 + |
42 + |
91 + -- Myhailo Danylenko, 2011-06-01 |
109 + -- Myhailo Danylenko, 2011-06-01 |
92 + |
110 + |
93 dev (20) |
111 dev (20) |
94 |
112 |
95 * Add cmd_set_safe() and cmd_is_safe() |
113 * Add cmd_set_safe() and cmd_is_safe() |
96 diff -r a466d2a1ca15 mcabber/configure.ac |
114 diff -r b47f104be890 mcabber/configure.ac |
97 --- a/mcabber/configure.ac Wed Nov 12 00:15:59 2014 +0200 |
115 --- a/mcabber/configure.ac Sat Nov 07 14:22:58 2015 +0200 |
98 +++ b/mcabber/configure.ac Wed Nov 12 00:16:06 2014 +0200 |
116 +++ b/mcabber/configure.ac Sat Nov 07 14:55:06 2015 +0200 |
99 @@ -284,7 +284,7 @@ |
117 @@ -284,7 +284,7 @@ |
100 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
118 AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno]) |
101 |
119 |
102 # Prepare some config.h variables |
120 # Prepare some config.h variables |
103 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
121 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch]) |
104 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
122 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch]) |
105 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
123 AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string]) |
106 |
124 |
107 # We need _GNU_SOURCE for strptime() and strcasestr() |
125 # We need _GNU_SOURCE for strptime() and strcasestr() |
108 diff -r a466d2a1ca15 mcabber/mcabber/api.h |
126 diff -r b47f104be890 mcabber/mcabber/api.h |
109 --- a/mcabber/mcabber/api.h Wed Nov 12 00:15:59 2014 +0200 |
127 --- a/mcabber/mcabber/api.h Sat Nov 07 14:22:58 2015 +0200 |
110 +++ b/mcabber/mcabber/api.h Wed Nov 12 00:16:06 2014 +0200 |
128 +++ b/mcabber/mcabber/api.h Sat Nov 07 14:55:06 2015 +0200 |
111 @@ -4,10 +4,10 @@ |
129 @@ -4,10 +4,10 @@ |
112 #include <glib.h> |
130 #include <glib.h> |
113 #include <mcabber/config.h> // For MCABBER_BRANCH |
131 #include <mcabber/config.h> // For MCABBER_BRANCH |
114 |
132 |
115 -#define MCABBER_API_VERSION 36 |
133 -#define MCABBER_API_VERSION 41 |
116 -#define MCABBER_API_MIN 36 |
134 -#define MCABBER_API_MIN 41 |
117 +#define MCABBER_API_VERSION 43 |
135 +#define MCABBER_API_VERSION 45 |
118 +#define MCABBER_API_MIN 43 |
136 +#define MCABBER_API_MIN 45 |
119 |
137 |
120 -#define MCABBER_BRANCH_DEV 1 |
138 -#define MCABBER_BRANCH_DEV 1 |
121 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
139 +#define MCABBER_BRANCH_EXPERIMENTAL 1 |
122 |
140 |
123 // cmd_add returns gpointer id |
141 // cmd_add returns gpointer id |