diff options
author | James Booth <boothj5@gmail.com> | 2015-04-19 19:50:19 +0100 |
---|---|---|
committer | James Booth <boothj5@gmail.com> | 2015-04-19 19:50:19 +0100 |
commit | 9be265591a4e070f26edca7f9bfa3d84c932bd5a (patch) | |
tree | a7bb54231a3ef8c2cf2a849853b7c404673b6bfc /Makefile.am | |
parent | d612b9695a762db2264113b9cc73ecc8adf685d2 (diff) | |
parent | 32da6548da7bc9941b2ff64924223d67cdb0b063 (diff) | |
download | profani-tty-9be265591a4e070f26edca7f9bfa3d84c932bd5a.tar.gz |
Merge branch 'master' into pgp
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f3341d04..0963e3a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,6 +14,7 @@ core_sources = \ src/xmpp/bookmark.c src/xmpp/bookmark.h \ src/xmpp/form.c src/xmpp/form.h \ src/event/server_events.c src/event/server_events.h \ + src/event/client_events.c src/event/client_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/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ @@ -62,6 +63,7 @@ tests_sources = \ src/ui/titlebar.c src/ui/statusbar.c src/ui/inputwin.c \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ src/event/server_events.c src/event/server_events.h \ + src/event/client_events.c src/event/client_events.h \ tests/xmpp/stub_xmpp.c \ tests/ui/stub_ui.c \ tests/pgp/stub_gpg.c \ |