diff options
| author | Alban Crequy <alban.crequy@collabora.co.uk> | 2008-11-24 12:18:44 +0000 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-02-03 14:30:24 +0000 |
| commit | 144f7f0a3d1f94c569a13a7079ee6f0d94b702fd (patch) | |
| tree | 0dd13a11ba5e7b961b27b1bd016685c7e7aadb09 /extensions | |
| parent | ba414deebc7d20e6672acc220bbfcba5aa13b6a1 (diff) | |
| download | telepathy-salut-144f7f0a3d1f94c569a13a7079ee6f0d94b702fd.tar.gz | |
extensions/all.xml: Fix previous conflict
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/all.xml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/extensions/all.xml b/extensions/all.xml index 9e9ad6d5..f09d0be4 100644 --- a/extensions/all.xml +++ b/extensions/all.xml @@ -46,14 +46,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> from="Telepathy specification"/> <!-- use types from Channel_Type_Tubes --> - <tp:external-type name="Socket_Address_Type" type="u" - from="Telepathy specification"/> - <tp:external-type name="Socket_Access_Control" type="u" + <tp:external-type name="DBus_Tube_Member" type="(us)" from="Telepathy specification"/> <tp:external-type name="Supported_Socket_Map" type="a{uau}" from="Telepathy specification"/> - <tp:external-type name="DBus_Tube_Member" type="(us)" - from="Telepathy specification"/> </tp:generic-types> </tp:spec> |