Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-04-10 13:02:28 +01:00
6 changed files with 156 additions and 24 deletions

1
tmux.h
View File

@ -1924,6 +1924,7 @@ void server_status_window(struct window *);
void server_lock(void);
void server_lock_session(struct session *);
void server_lock_client(struct client *);
void server_kill_pane(struct window_pane *);
void server_kill_window(struct window *);
int server_link_window(struct session *,
struct winlink *, struct session *, int, int, int, char **);