diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-31 11:12:24 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-31 11:12:24 +0100 |
| commit | ffaf494475fa3720f48af8d9771f7b0f5b3c1993 (patch) | |
| tree | 397a6198e42ad788c1eb76f1508094c5db125cc4 /telepathy-glib/base-connection-manager.c | |
| parent | 6b3e4bf46765578e2f5550a0872dc56b58f561ce (diff) | |
| parent | 84f63e56bbc5f32c418d8112b32574f62588b000 (diff) | |
Merge branch 'master' into next
Conflicts:
configure.ac
telepathy-glib/abi.am
telepathy-glib/base-client.c
telepathy-glib/base-connection.c
telepathy-glib/codegen.am
telepathy-glib/contact.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'telepathy-glib/base-connection-manager.c')
| -rw-r--r-- | telepathy-glib/base-connection-manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telepathy-glib/base-connection-manager.c b/telepathy-glib/base-connection-manager.c index 44017a199..54c235b37 100644 --- a/telepathy-glib/base-connection-manager.c +++ b/telepathy-glib/base-connection-manager.c @@ -95,7 +95,7 @@ * filled in by subclasses. The default is to list no additional interfaces. * Implementations must first chainup on parent class implementation and then * add extra interfaces to the #GPtrArray. Replaces @interfaces. Since: - * 0.UNRELEASED + * 0.19.4 * * The class structure for #TpBaseConnectionManager. * @@ -156,7 +156,7 @@ * Returns: (transfer container): a #GPtrArray of static strings for D-Bus * interfaces implemented by this client. * - * Since: 0.UNRELEASED + * Since: 0.19.4 */ static void service_iface_init (gpointer, gpointer); |