diff options
| author | James Booth <boothj5@gmail.com> | 2015-04-19 16:56:11 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-04-19 16:56:11 +0100 |
| commit | 60f94722d469d24b51634ad09134ce5424e4219f (patch) | |
| tree | 2fd013b6078c72e33447ee7b9c9cdf9ec9090493 /Makefile.am | |
| parent | bcfbbac49a0b031a16f61204955861fd2f7c6db8 (diff) | |
| parent | 424f52c3fa0665babd9550cff75e7384ae3a369c (diff) | |
| download | profani-tty-60f94722d469d24b51634ad09134ce5424e4219f.tar.gz | |
Merge branch 'master' into pgp
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e14010a7..f3341d04 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ core_sources = \ src/xmpp/roster.c src/xmpp/roster.h \ src/xmpp/bookmark.c src/xmpp/bookmark.h \ src/xmpp/form.c src/xmpp/form.h \ - src/server_events.c src/server_events.h \ + src/event/server_events.c src/event/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/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ @@ -61,7 +61,7 @@ tests_sources = \ src/ui/buffer.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 \ - src/server_events.c src/server_events.h \ + src/event/server_events.c src/event/server_events.h \ tests/xmpp/stub_xmpp.c \ tests/ui/stub_ui.c \ tests/pgp/stub_gpg.c \ |