Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-05-12 18:01:10 +01:00
4 changed files with 28 additions and 28 deletions

2
tmux.h
View File

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