Merge branch 'obsd-master'

Conflicts:
	Makefile.am
	pty.c
This commit is contained in:
Thomas Adam
2017-04-21 09:25:07 +01:00
5 changed files with 5 additions and 96 deletions

View File

@ -151,7 +151,7 @@ dist_tmux_SOURCES = \
options.c \
paste.c \
proc.c \
pty.c \
procname.c \
resize.c \
screen-redraw.c \
screen-write.c \