diff options
author | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
---|---|---|
committer | Thomas Adam <thomas@xteddy.org> | 2017-05-31 15:56:13 +0100 |
commit | f17ecaa49544509e93716a84b6510990ed90ceca (patch) | |
tree | 6b89857ce59fc9330c136961defdcc0923cbff40 /Makefile.am | |
parent | 9c4d0d454aa81b9587ed724e0f87395b1791ce2f (diff) | |
parent | d60663ea8664d1c71def883bd64d97af3f791f89 (diff) |
Merge branch 'obsd-master'
Conflicts:
Makefile.am
cfg.c
server-client.c
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 b2464030..14afb628 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,8 +66,6 @@ dist_tmux_SOURCES = \ cmd-bind-key.c \ cmd-break-pane.c \ cmd-capture-pane.c \ - cmd-choose-buffer.c \ - cmd-choose-client.c \ cmd-choose-tree.c \ cmd-command-prompt.c \ cmd-confirm-before.c \ @@ -145,6 +143,7 @@ dist_tmux_SOURCES = \ layout-set.c \ layout.c \ log.c \ + mode-tree.c \ names.c \ notify.c \ options-table.c \ @@ -169,9 +168,11 @@ dist_tmux_SOURCES = \ tty-term.c \ tty.c \ utf8.c \ - window-choose.c \ + window-buffer.c \ + window-client.c \ window-clock.c \ window-copy.c \ + window-tree.c \ window.c \ xmalloc.c \ xmalloc.h \ |