diff options
author | James Booth <boothj5@gmail.com> | 2014-01-05 23:58:10 +0000 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2014-01-05 23:58:10 +0000 |
commit | 0776c574b6b75781547a475a7a420b5b6266d57f (patch) | |
tree | 2237053a598c5a621259612008811ffa2c21030a /Makefile.am | |
parent | 77f54443eb9aa09ba33714831ff80b4e7a8fc412 (diff) | |
parent | db973457d0b3548f767f9849ce8ca7816dcbd36e (diff) | |
download | profani-tty-0776c574b6b75781547a475a7a420b5b6266d57f.tar.gz |
Merge branch 'master' into otr
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index e1905ad8..c9e4d9db 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,7 @@ core_sources = \ src/xmpp/capabilities.h src/xmpp/connection.h \ src/xmpp/roster.c src/xmpp/roster.h \ src/xmpp/bookmark.c src/xmpp/bookmark.h \ + src/server_events.c src/server_events.h \ src/ui/ui.h src/ui/window.c src/ui/window.h src/ui/core.c \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/console.c src/ui/notifier.c \ |