diff options
| author | James Booth <boothj5@gmail.com> | 2015-11-24 00:08:47 +0000 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-11-24 00:08:47 +0000 |
| commit | 52d4e70d7652ec61a4db0d5903666f39106fe618 (patch) | |
| tree | a299e66410f923e92dcea2f1177ed2e3b26de6d5 /Makefile.am | |
| parent | b79d77409fe3d7f342055dd2826b3f51f797613e (diff) | |
| parent | a2f5e921f2e5fb4158aad14928882e694e5d8a85 (diff) | |
| download | profani-tty-52d4e70d7652ec61a4db0d5903666f39106fe618.tar.gz | |
Merge branch 'master' into notifications
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 21b0d3aa..1f7e0350 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,6 +35,7 @@ core_sources = \ src/tools/p_sha1.h src/tools/p_sha1.c \ src/tools/autocomplete.c src/tools/autocomplete.h \ src/tools/tinyurl.c src/tools/tinyurl.h \ + src/config/conflists.c src/config/conflists.h \ src/config/accounts.c src/config/accounts.h \ src/config/tlscerts.c src/config/tlscerts.h \ src/config/account.c src/config/account.h \ @@ -67,6 +68,7 @@ unittest_sources = \ src/config/preferences.c src/config/preferences.h \ src/config/theme.c src/config/theme.h \ src/config/scripts.c src/config/scripts.h \ + src/config/conflists.c src/config/conflists.h \ src/window_list.c src/window_list.h \ src/event/server_events.c src/event/server_events.h \ src/event/client_events.c src/event/client_events.h \ |