Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-02-09 14:01:18 +00:00
4 changed files with 38 additions and 21 deletions

2
tmux.h
View File

@ -1830,6 +1830,8 @@ void server_client_exec(struct client *, const char *);
void server_client_loop(void);
void server_client_push_stdout(struct client *);
void server_client_push_stderr(struct client *);
void printflike(2, 3) server_client_add_message(struct client *, const char *,
...);
/* server-fn.c */
void server_fill_environ(struct session *, struct environ *);