Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-07-15 12:01:10 +01:00
5 changed files with 36 additions and 14 deletions

1
tmux.h
View File

@ -1695,6 +1695,7 @@ void environ_put(struct environ *, const char *);
void environ_unset(struct environ *, const char *);
void environ_update(const char *, struct environ *, struct environ *);
void environ_push(struct environ *);
void environ_log(struct environ *, const char *);
/* tty.c */
void tty_create_log(void);