Merge branch 'obsd-master'

Sync from OpenBSD.
This commit is contained in:
Thomas Adam
2012-12-08 20:29:37 +00:00
5 changed files with 57 additions and 45 deletions

2
tmux.h
View File

@ -1516,7 +1516,7 @@ extern int cfg_finished;
extern int cfg_references;
extern struct causelist cfg_causes;
void printflike2 cfg_add_cause(struct causelist *, const char *, ...);
int load_cfg(const char *, struct cmd_ctx *, struct causelist *);
enum cmd_retval load_cfg(const char *, struct cmd_ctx *, struct causelist *);
void show_cfg_causes(struct session *);
/* format.c */