diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-17 00:40:06 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-17 00:40:06 +0100 |
| commit | 8fde14879a7f9d6d6a60244e8f8000c123dd3115 (patch) | |
| tree | 34916cad79cb270959b576f3f46231db1b4d2231 /Makefile.am | |
| parent | 637b8bee9fcaeedbb09636b76e34270abbfcab47 (diff) | |
| parent | a798dc5618580265e60f93be091b649b4bf86dee (diff) | |
| download | profani-tty-8fde14879a7f9d6d6a60244e8f8000c123dd3115.tar.gz | |
Merge branch 'master' into openpgp
Conflicts: src/command/commands.c src/command/commands.h
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 9b5caa85..e524a48f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ core_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/ui/console.c src/ui/notifier.c \ + src/ui/win_types.h \ src/window_list.c src/window_list.h \ src/ui/rosterwin.c src/ui/occupantswin.c \ src/ui/buffer.c src/ui/buffer.h \ |