diff options
| author | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-02-06 14:36:14 +0100 |
|---|---|---|
| committer | Xavier Claessens <xavier.claessens@collabora.co.uk> | 2012-02-06 14:36:14 +0100 |
| commit | b978d265c7e7fde904976f432d7b519dd58aec9d (patch) | |
| tree | 7b337605a6c93afeaee0a6b1e2a05786b8770498 /telepathy-glib/base-channel.c | |
| parent | a6ce47466a1a725498ea1a54c4a2983063d15049 (diff) | |
| parent | 6d3b611885665f46356623ccb296fe97a8bd8b6a (diff) | |
| download | telepathy-glib-b978d265c7e7fde904976f432d7b519dd58aec9d.tar.gz | |
Merge branch 'master' into call1
Conflicts:
examples/cm/callable/conn.c
examples/cm/callable/connection-manager.c
examples/cm/callable/media-channel.c
examples/cm/callable/media-manager.c
examples/cm/callable/media-stream.c
examples/cm/callable/protocol.c
examples/future/call-cm/call-channel.c
examples/future/call-cm/call-content.c
examples/future/call-cm/call-stream.c
extensions/call-content.c
extensions/call-stream.c
extensions/extensions-cli.c
tests/dbus/call-example.c
tests/dbus/callable-example.c
Diffstat (limited to 'telepathy-glib/base-channel.c')
| -rw-r--r-- | telepathy-glib/base-channel.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/telepathy-glib/base-channel.c b/telepathy-glib/base-channel.c index b5fe3ff1b..d5ee5585c 100644 --- a/telepathy-glib/base-channel.c +++ b/telepathy-glib/base-channel.c @@ -234,6 +234,7 @@ */ #include "config.h" + #include "base-channel.h" #include <dbus/dbus-glib-lowlevel.h> |