Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-06-15 14:01:09 +01:00
5 changed files with 15 additions and 0 deletions

1
tmux.h
View File

@ -896,6 +896,7 @@ struct window {
char *name;
struct event name_timer;
struct timeval silence_timer;
struct timeval activity_time;
struct window_pane *active;
struct window_pane *last;