diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-06-05 00:09:44 +0800 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2009-06-05 00:09:44 +0800 |
| commit | b1d33938778faa1faa3687e87bb8646d6668992d (patch) | |
| tree | 4c1676f40a867ae06462f3e788b710912a56eea9 /extensions/Makefile.am | |
| parent | b788f7ca76096138b65f4518fb4435608cd0f91f (diff) | |
| parent | c06f26d8c999b47c22dcd78f07140d027e8882c7 (diff) | |
| download | gsoc2013-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/Makefile.am')
| -rw-r--r-- | extensions/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 85d2c0eda..0ed6fc522 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -16,7 +16,8 @@ EXTRA_DIST = \ misc.xml \ Channel_Handler.xml \ Connection_Interface_Location.xml \ - Tube_Handler.xml + Tube_Handler.xml \ + Debug.xml noinst_LTLIBRARIES = libemp-extensions.la |