diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-26 15:34:14 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-09-26 15:34:14 +0100 |
| commit | 03e2bb3d09b527c9144c3186d2f0f9aa7113aac9 (patch) | |
| tree | ce1a7042421ccbbd87d7fd210d75ab5b403b90e1 | |
| parent | 5765148158effd59f99976b5d6c59d08a3117ac7 (diff) | |
| download | telepathy-glib-03e2bb3d09b527c9144c3186d2f0f9aa7113aac9.tar.gz | |
0.24 branch
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | docs/reference/telepathy-glib-sections.txt | 1 | ||||
| -rw-r--r-- | telepathy-glib/defs.h | 1 | ||||
| -rw-r--r-- | telepathy-glib/extra-gtkdoc.h | 7 |
5 files changed, 12 insertions, 3 deletions
@@ -1,4 +1,4 @@ -telepathy-glib 0.21.3 (UNRELEASED) +telepathy-glib 0.23.0 (UNRELEASED) ================================== ... diff --git a/configure.ac b/configure.ac index 1071ec52c..a30f61cda 100644 --- a/configure.ac +++ b/configure.ac @@ -10,8 +10,8 @@ AC_PREREQ([2.60]) # set nano_version to 1 m4_define([tp_glib_major_version], [0]) -m4_define([tp_glib_minor_version], [21]) -m4_define([tp_glib_micro_version], [2]) +m4_define([tp_glib_minor_version], [22]) +m4_define([tp_glib_micro_version], [99]) m4_define([tp_glib_nano_version], [1]) # If library source has changed since last release, increment revision diff --git a/docs/reference/telepathy-glib-sections.txt b/docs/reference/telepathy-glib-sections.txt index 9a0003bd1..571710534 100644 --- a/docs/reference/telepathy-glib-sections.txt +++ b/docs/reference/telepathy-glib-sections.txt @@ -45,6 +45,7 @@ TP_VERSION_0_16 TP_VERSION_0_18 TP_VERSION_0_20 TP_VERSION_0_22 +TP_VERSION_0_24 TP_VERSION_MIN_REQUIRED TP_VERSION_MAX_ALLOWED <SUBSECTION Private> diff --git a/telepathy-glib/defs.h b/telepathy-glib/defs.h index 80d24c113..327ff17e1 100644 --- a/telepathy-glib/defs.h +++ b/telepathy-glib/defs.h @@ -160,6 +160,7 @@ G_BEGIN_DECLS #define TP_VERSION_0_18 (_TP_ENCODE_VERSION (0, 18)) #define TP_VERSION_0_20 (_TP_ENCODE_VERSION (0, 20)) #define TP_VERSION_0_22 (_TP_ENCODE_VERSION (0, 22)) +#define TP_VERSION_0_24 (_TP_ENCODE_VERSION (0, 24)) #define TP_VERSION_1_0 (_TP_ENCODE_VERSION (1, 0)) #if (TP_MINOR_VERSION == 99) diff --git a/telepathy-glib/extra-gtkdoc.h b/telepathy-glib/extra-gtkdoc.h index 6731a95e5..b1e5860b0 100644 --- a/telepathy-glib/extra-gtkdoc.h +++ b/telepathy-glib/extra-gtkdoc.h @@ -471,6 +471,13 @@ */ /** + * TP_VERSION_0_24: (skip) + * + * A constant representing the telepathy-glib 0.24 stable branch, + * and the 0.23 development branch that led to it. + */ + +/** * TP_VERSION_1_0: (skip) * * A constant representing the telepathy-glib 1.0 stable branch, |