Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-11 13:24:45 +00:00
25 changed files with 34 additions and 28 deletions

2
tmux.h
View File

@ -1494,7 +1494,7 @@ char *paste_make_sample(struct paste_buffer *);
#define FORMAT_STATUS 0x1
#define FORMAT_FORCE 0x2
struct format_tree;
struct format_tree *format_create(int);
struct format_tree *format_create(struct cmd_q *, int);
void format_free(struct format_tree *);
void printflike(3, 4) format_add(struct format_tree *, const char *,
const char *, ...);