aboutsummaryrefslogtreecommitdiffstats
path: root/extensions/misc.xml
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2009-06-05 00:09:44 +0800
committerJonny Lamb <jonny.lamb@collabora.co.uk>2009-06-05 00:09:44 +0800
commitb1d33938778faa1faa3687e87bb8646d6668992d (patch)
tree4c1676f40a867ae06462f3e788b710912a56eea9 /extensions/misc.xml
parentb788f7ca76096138b65f4518fb4435608cd0f91f (diff)
parentc06f26d8c999b47c22dcd78f07140d027e8882c7 (diff)
downloadgsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar
gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.gz
gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.bz2
gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.lz
gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.xz
gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.tar.zst
gsoc2013-empathy-b1d33938778faa1faa3687e87bb8646d6668992d.zip
Merge branch 'debug'
Conflicts: extensions/Makefile.am extensions/misc.xml po/POTFILES.in Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
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 8b29ebb7c..dd3125fb2 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="Connection_Interface_Location.xml"/>
+<xi:include href="Debug.xml" />
</tp:spec>