Merge branch 'obsd-master'

Conflicts:
	Makefile
This commit is contained in:
Thomas Adam
2015-02-14 23:54:07 +00:00
7 changed files with 31 additions and 65 deletions

View File

@ -73,7 +73,6 @@ dist_tmux_SOURCES = \
cmd-choose-client.c \
cmd-choose-tree.c \
cmd-clear-history.c \
cmd-clock-mode.c \
cmd-command-prompt.c \
cmd-confirm-before.c \
cmd-copy-mode.c \