Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-01-15 12:01:11 +00:00
3 changed files with 5 additions and 5 deletions

2
tmux.h
View File

@ -1542,7 +1542,7 @@ extern struct client *cfg_client;
void start_cfg(void);
int load_cfg(const char *, struct cmd_q *, char **);
void set_cfg_file(const char *);
void cfg_add_cause(const char *, ...);
void printflike(1, 2) cfg_add_cause(const char *, ...);
void cfg_print_causes(struct cmd_q *);
void cfg_show_causes(struct session *);