summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2017-01-23 12:20:43 +0000
committerThomas Adam <thomas@xteddy.org>2017-01-23 12:20:43 +0000
commitb3a724f30ced2f3be3a52fb54c6551b2b6c6de63 (patch)
treeeba69fe13464cf92fcf64cf32505e308949718b6 /Makefile.am
parentd2eab39ffa42a0d5d8e796cbe3352f951f42b4f7 (diff)
parent98e7fbb2acee0238381feea5d583fc439aae08e2 (diff)
Merge branch 'obsd-master'
Conflicts: Makefile tmux.c
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 0d95873c..cc165bea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,6 +165,7 @@ dist_tmux_SOURCES = \
options.c \
paste.c \
proc.c \
+ pty.c \
resize.c \
screen-redraw.c \
screen-write.c \