diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-21 08:58:09 +0000 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-03-21 08:58:09 +0000 |
| commit | cde06ccf071f793a81e0f71627719d7753d9430d (patch) | |
| tree | f0b43c4009b70f92e89b0e41ddfb406dcf6b3611 /salut/Makefile.am | |
| parent | 3c112f53e732306b95f1c01050972ac5fd6ecae2 (diff) | |
| parent | 14e2d72bbeae565a53fe8bd32f375c0cec3715c0 (diff) | |
| download | telepathy-salut-cde06ccf071f793a81e0f71627719d7753d9430d.tar.gz | |
Merge branch 'sidetzars'
Conflicts:
extensions/all.xml
salut/Makefile.am
src/salut-connection.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'salut/Makefile.am')
| -rw-r--r-- | salut/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/salut/Makefile.am b/salut/Makefile.am index af96051c..d2878b10 100644 --- a/salut/Makefile.am +++ b/salut/Makefile.am @@ -4,10 +4,12 @@ pkgconfig_DATA = telepathy-salut.pc salutincludedir = $(includedir)/telepathy-salut-0/salut salutinclude_HEADERS = \ + connection.h \ plugin.h \ protocol.h \ capabilities-set.h \ caps-channel-manager.h \ - capabilities.h + capabilities.h \ + sidecar.h endif |