diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2008-11-07 11:44:25 +0000 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2008-11-07 11:44:25 +0000 |
| commit | 5f076f78e4fc8d8aa09a300b07ab89d7f8ccf037 (patch) | |
| tree | e3e26d2bf80492b5959c81f97480ef473d354a5c /lib/gibber/Makefile.am | |
| parent | 23f876cdeb8e3ac14446d9a0acd181f2e0e4960f (diff) | |
| parent | 3bd83d7ad830df0ccae37a0811f00ddae4922ee8 (diff) | |
| download | telepathy-salut-5f076f78e4fc8d8aa09a300b07ab89d7f8ccf037.tar.gz | |
Merge branch 'master' into ft-requestotron
Conflicts:
lib/gibber/Makefile.am
tests/twisted/Makefile.am
Diffstat (limited to 'lib/gibber/Makefile.am')
| -rw-r--r-- | lib/gibber/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gibber/Makefile.am b/lib/gibber/Makefile.am index a72e48da..52eb77cc 100644 --- a/lib/gibber/Makefile.am +++ b/lib/gibber/Makefile.am @@ -62,6 +62,8 @@ HANDWRITTEN_SOURCES = \ gibber-file-transfer.h \ gibber-oob-file-transfer.c \ gibber-oob-file-transfer.h \ + gibber-listener.c \ + gibber-listener.h \ gibber-xmpp-connection-listener.c \ gibber-xmpp-connection-listener.h \ gibber-xmpp-error.h \ |