Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-25 18:01:11 +01:00
8 changed files with 47 additions and 16 deletions

2
tmux.h
View File

@ -1616,7 +1616,7 @@ void environ_unset(struct environ *, const char *);
void environ_update(struct options *, struct environ *, struct environ *);
void environ_push(struct environ *);
void environ_log(struct environ *, const char *);
struct environ *environ_for_session(struct session *);
struct environ *environ_for_session(struct session *, int);
/* tty.c */
void tty_create_log(void);