Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-02-14 20:01:12 +00:00
5 changed files with 68 additions and 53 deletions

2
tmux.h
View File

@ -1836,6 +1836,8 @@ 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 *,
...);
char *server_client_get_path(struct client *, const char *);
const char *server_client_get_cwd(struct client *);
/* server-fn.c */
void server_fill_environ(struct session *, struct environ *);