diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-11-30 16:29:54 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-11-30 16:29:54 +0000 |
| commit | 92d7ce512fa88d6e3ffb4c4da4aebeb7e529035a (patch) | |
| tree | 0e99a3e46337b152a92f8a565f0c10591e85fb91 /qt4/TelepathyQt4/future-channel.xml | |
| parent | 18746bafae9ac426a512f15c780b5911a8c7eaed (diff) | |
| parent | 83ab35a5d0568717451cfd328f60fc15995a9f7d (diff) | |
Merge remote-tracking branch 'qt4/testing'
Diffstat (limited to 'qt4/TelepathyQt4/future-channel.xml')
| -rw-r--r-- | qt4/TelepathyQt4/future-channel.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/qt4/TelepathyQt4/future-channel.xml b/qt4/TelepathyQt4/future-channel.xml new file mode 100644 index 000000000..6cf1e4948 --- /dev/null +++ b/qt4/TelepathyQt4/future-channel.xml @@ -0,0 +1,13 @@ +<tp:spec + xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0" + xmlns:xi="http://www.w3.org/2001/XInclude"> + +<tp:title>Channel extensions from the future</tp:title> + +<xi:include href="../spec/Channel_Interface_Mergeable_Conference.xml"/> +<xi:include href="../spec/Channel_Interface_Splittable.xml"/> + +<xi:include href="../spec/generic-types.xml"/> +<xi:include href="../spec/errors.xml"/> + +</tp:spec> |