diff options
| author | Thomas Adam <thomas@xteddy.org> | 2017-07-12 13:39:59 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2017-07-12 13:43:08 +0100 |
| commit | 1076a2e26c224d17c32a2d1770997d8718903f20 (patch) | |
| tree | 2a51f6e719b9cbff0e37d7a887e56992ffb875bd /Makefile.am | |
| parent | fbbf5a108b01c742ca11e779845a4d19a1c5edd1 (diff) | |
| parent | 51112221eeb31ced907f0dfcf077582996c20c07 (diff) | |
Merge branch 'obsd-master'
Conflicts:
cmd-pipe-pane.c
proc.c
tmux.c
window.c
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index bdc752c2..4951a00e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -158,7 +158,6 @@ dist_tmux_SOURCES = \ server-fn.c \ server.c \ session.c \ - signal.c \ status.c \ style.c \ tmux.c \ |