diff options
| author | James Booth <boothj5@gmail.com> | 2014-01-02 01:57:05 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2014-01-02 01:57:05 +0000 |
| commit | 170af88c0dc736087d40d3591c1880d8af17b5e6 (patch) | |
| tree | 29c912e2fe3261e758691254dbddbe43c6d139c7 /Makefile.am | |
| parent | bc700fbfeac560946991063313f293a9861d4d1d (diff) | |
| parent | 3fbd45bd0603d51255c9e6df2a56d5cd5de4dd2b (diff) | |
| download | profani-tty-170af88c0dc736087d40d3591c1880d8af17b5e6.tar.gz | |
Merge branch 'master' into otr
Conflicts: Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 107956b9..61c824b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -62,15 +62,16 @@ test_sources = \ src/config/preferences.c src/config/preferences.h \ src/config/theme.c src/config/theme.h \ src/otr.c src/otr.h \ - tests/ui/mock_ui.c \ - tests/xmpp/mock_xmpp.c \ + tests/xmpp/mock_xmpp.h tests/xmpp/mock_xmpp.c \ + tests/ui/mock_ui.h tests/ui/mock_ui.c \ + tests/config/mock_accounts.h tests/config/mock_accounts.c \ tests/log/mock_log.c \ - tests/config/mock_accounts.c \ tests/test_autocomplete.c \ tests/test_common.c \ tests/test_cmd_connect.c \ tests/test_cmd_account.c \ tests/test_cmd_rooms.c \ + tests/test_cmd_sub.c \ tests/test_history.c \ tests/test_jid.c \ tests/test_parser.c \ |