diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-05 09:50:44 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-05 09:50:44 +0100 |
| commit | 871abd7cb3f8d7c44f55542a4d757a34f7ca3a1f (patch) | |
| tree | b66082ecb2138f3f7cb72fbc2ee477e532b2cefd /src/Makefile.am | |
| parent | 165dfad6d746110a90693cc366fc58556bdff42e (diff) | |
| parent | cfdad47a9ef766fbcee6d47476110cd92c6a2dc2 (diff) | |
| download | telepathy-salut-871abd7cb3f8d7c44f55542a4d757a34f7ca3a1f.tar.gz | |
Merge branch 'meta-porter'
Conflicts:
.gitignore
src/salut-connection.c
src/salut-disco.c
src/salut-self.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 8056bb80..c4d27c21 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -67,8 +67,6 @@ CORE_SOURCES = \ text-helper.h \ salut-roomlist-channel.h \ salut-roomlist-channel.c \ - salut-xmpp-connection-manager.h \ - salut-xmpp-connection-manager.c \ salut-discovery-client.h \ salut-discovery-client.c \ tube-dbus.h \ |