diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-10-29 12:50:05 +0000 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-10-29 12:51:21 +0000 |
| commit | 35ffd093d724053046ae49984af0beb0530e5560 (patch) | |
| tree | d5b89a213621dc56b852fc7eb8a1daba12046830 /Makefile.am | |
| parent | 201036ad80f2e51f7238db2adf05914a4a4f5819 (diff) | |
| parent | 10a9440055ccdda5788965bcb048207eab2a0548 (diff) | |
Merge branch 'obsd-master'
Conflicts:
Makefile
cmd-link-window.c
cmd-unlink-window.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 81ef1b25..82469e4f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -88,7 +88,6 @@ dist_tmux_SOURCES = \ cmd-kill-server.c \ cmd-kill-session.c \ cmd-kill-window.c \ - cmd-link-window.c \ cmd-list-buffers.c \ cmd-list-clients.c \ cmd-list-keys.c \ @@ -130,7 +129,6 @@ dist_tmux_SOURCES = \ cmd-swap-window.c \ cmd-switch-client.c \ cmd-unbind-key.c \ - cmd-unlink-window.c \ cmd-wait-for.c \ cmd.c \ colour.c \ |