diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-02-17 17:31:17 +0000 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2009-02-17 17:31:17 +0000 |
| commit | a77622c4e78fb67406d045260693f1d1c19dbc5f (patch) | |
| tree | 79bfa35f93ce018f2096e7b9428240af65040cd2 /extensions/Makefile.am | |
| parent | 15c21b8180b8c782d90e3a1a58437c2b0ecacbe8 (diff) | |
| parent | 79a7acd7e4fb70404407c0c8df05a8b6778684e2 (diff) | |
| download | telepathy-salut-a77622c4e78fb67406d045260693f1d1c19dbc5f.tar.gz | |
Merge branch 'master' into requestotron-tubes-and-caps-with-complex-types-with-gibber-listener-REBASED
Conflicts:
extensions/Makefile.am
Diffstat (limited to 'extensions/Makefile.am')
| -rw-r--r-- | extensions/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am index c6c0de91..3b3e20f2 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -2,7 +2,6 @@ tools_dir = $(top_srcdir)/tools EXTRA_DIST = \ Connection_Interface_Contact_Capabilities.xml \ - Channel_Type_File_Transfer.xml \ Channel_Type_Stream_Tube.xml \ Channel_Type_DBus_Tube.xml \ Channel_Interface_Tube.xml \ |