diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-11 12:02:09 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-11 12:02:09 +0100 |
| commit | 4c720bc262ea35b802606910b63b57f28929bdc6 (patch) | |
| tree | 3b1f466abaa19717f66f71193f0edc804e59abf6 /gabble | |
| parent | 36b4819e116fbbcca22c7c87d72d31353b6802bb (diff) | |
| parent | 5c2184c21b1e8878394834a3b1ef9096a3c51087 (diff) | |
Merge branch 'telepathy-gabble-0.16'
Conflicts:
NEWS
configure.ac
src/conn-addressing.c
src/jingle-info.c
src/media-channel-hold.c
src/message-util.c
src/muc-tube-dbus.c
src/muc-tube-stream.c
src/olpc-activity.c
src/presence-cache.c
src/protocol.c
src/room-config.c
Diffstat (limited to 'gabble')
| -rw-r--r-- | gabble/capabilities.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gabble/capabilities.h b/gabble/capabilities.h index 81c8c2546..dd0a0c901 100644 --- a/gabble/capabilities.h +++ b/gabble/capabilities.h @@ -65,6 +65,7 @@ const GabbleCapabilitySet *gabble_capabilities_get_olpc_notify (void); const GabbleCapabilitySet *gabble_capabilities_get_bundle_share_v1 (void); const GabbleCapabilitySet *gabble_capabilities_get_bundle_voice_v1 (void); const GabbleCapabilitySet *gabble_capabilities_get_bundle_video_v1 (void); +const GabbleCapabilitySet *gabble_capabilities_get_bundle_camera_v1 (void); /* Return the capabilities we always have */ const GabbleCapabilitySet *gabble_capabilities_get_fixed_caps (void); |