aboutsummaryrefslogtreecommitdiffstats
path: root/extensions/misc.xml
diff options
context:
space:
mode:
authorDanielle Madeley <danielle.madeley@collabora.co.uk>2009-12-22 18:56:31 +0800
committerDanielle Madeley <danielle.madeley@collabora.co.uk>2009-12-22 18:56:31 +0800
commit10bb432035ea43ab4ea7af7479fa0bc416cf7a59 (patch)
treee89df29170516fd2647f2cb46c1e480b1c5bcbcf /extensions/misc.xml
parentd8a2cee1b7e31dc7d415bdfe6cf73c639e84cf7d (diff)
parentfa658816077d8dfcd59978bcb69b00b789f12636 (diff)
downloadgsoc2013-empathy-10bb432035ea43ab4ea7af7479fa0bc416cf7a59.tar
gsoc2013-empathy-10bb432035ea43ab4ea7af7479fa0bc416cf7a59.tar.gz
gsoc2013-empathy-10bb432035ea43ab4ea7af7479fa0bc416cf7a59.tar.bz2
gsoc2013-empathy-10bb432035ea43ab4ea7af7479fa0bc416cf7a59.tar.lz
gsoc2013-empathy-10bb432035ea43ab4ea7af7479fa0bc416cf7a59.tar.xz
gsoc2013-empathy-10bb432035ea43ab4ea7af7479fa0bc416cf7a59.tar.zst
gsoc2013-empathy-10bb432035ea43ab4ea7af7479fa0bc416cf7a59.zip
Merge branch 'pmuc'
Diffstat (limited to 'extensions/misc.xml')
-rw-r--r--extensions/misc.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/extensions/misc.xml b/extensions/misc.xml
index 746cd9074..6eea49a2d 100644
--- a/extensions/misc.xml
+++ b/extensions/misc.xml
@@ -7,5 +7,6 @@
<xi:include href="Channel_Handler.xml"/>
<xi:include href="Tube_Handler.xml"/>
<xi:include href="Debug.xml" />
+<xi:include href="Channel_Interface_Conference.xml" />
</tp:spec>