Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-09 22:01:12 +00:00
4 changed files with 166 additions and 34 deletions

1
tmux.h
View File

@ -1570,6 +1570,7 @@ char *paste_make_sample(struct paste_buffer *);
/* format.c */
#define FORMAT_STATUS 0x1
#define FORMAT_FORCE 0x2
#define FORMAT_NOJOBS 0x4
struct format_tree;
struct format_tree *format_create(struct cmdq_item *, int);
void format_free(struct format_tree *);