Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.c
This commit is contained in:
Thomas Adam
2017-01-23 12:20:43 +00:00
6 changed files with 79 additions and 1 deletions

View File

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