Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-05-27 16:01:22 +01:00
7 changed files with 206 additions and 269 deletions

2
tmux.h
View File

@ -1479,7 +1479,9 @@ void cfg_show_causes(struct session *);
/* format.c */
struct format_tree;
void format_clean(void);
struct format_tree *format_create(void);
struct format_tree *format_create_status(int);
void format_free(struct format_tree *);
void printflike(3, 4) format_add(struct format_tree *, const char *,
const char *, ...);