Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-06-11 22:01:23 +01:00
4 changed files with 52 additions and 19 deletions

1
tmux.h
View File

@ -1924,6 +1924,7 @@ struct format_tree *format_create(struct client *, struct cmdq_item *, int,
int);
void format_free(struct format_tree *);
void format_merge(struct format_tree *, struct format_tree *);
struct window_pane *format_get_pane(struct format_tree *);
void printflike(3, 4) format_add(struct format_tree *, const char *,
const char *, ...);
void format_add_tv(struct format_tree *, const char *,