diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-09-21 19:08:16 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2010-09-21 19:08:53 +0100 |
| commit | 56dfc05134c9326b56cf8b53437f613c65caff0d (patch) | |
| tree | 84612a73aeb6ad7537d1f85b4856dd7347f932ba /extensions/Makefile.am | |
| parent | a814fb4d83507c4f7a90cc4c81a25872e82dd550 (diff) | |
| parent | 10fd7b2eab1abc68a72f06476dbbf1bc59d7c529 (diff) | |
Merge branch 'client-types'
Conflicts:
src/connection.c
src/debug.c
src/debug.h
src/presence-cache.c
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 9748d587c..622498179 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -24,7 +24,8 @@ EXTRA_DIST = \ OLPC_Channel_Type_BuddyView.xml \ OLPC_Channel_Type_ActivityView.xml \ Channel_Interface_Sasl_Authentication.xml \ - Channel_Type_Server_Authentication.xml + Channel_Type_Server_Authentication.xml \ + Connection_Interface_Client_Types.xml noinst_LTLIBRARIES = libgabble-extensions.la |