diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-28 23:57:28 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-28 23:57:28 +0100 |
| commit | 5d827cafec736050f101a407aa281ddc2bb2c60d (patch) | |
| tree | 12834644d17aebb7342d377a0eb7e0d8b5bbc2e6 /Makefile.am | |
| parent | 43189b1ab428444ba5a0bca088cd7b55293b9540 (diff) | |
| parent | d3698e6bee7985cd1707ec7b50fe61a5bf0c2829 (diff) | |
| download | profani-tty-5d827cafec736050f101a407aa281ddc2bb2c60d.tar.gz | |
Merge branch 'master' into pgp
Conflicts: src/xmpp/message.c
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 0963e3a5..4f7f2c3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,6 +15,7 @@ core_sources = \ 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/event/ui_events.c src/event/ui_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 \ @@ -64,6 +65,7 @@ tests_sources = \ 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 \ + src/event/ui_events.c src/event/ui_events.h \ tests/xmpp/stub_xmpp.c \ tests/ui/stub_ui.c \ tests/pgp/stub_gpg.c \ |