Merge branch 'obsd-master'

Conflicts:
	format.c
This commit is contained in:
Thomas Adam
2014-12-19 19:20:09 +00:00
6 changed files with 33 additions and 3 deletions

1
tmux.h
View File

@ -888,6 +888,7 @@ struct window_pane {
pid_t pid;
char tty[TTY_NAME_MAX];
int status;
u_int changes;
struct event changes_timer;