Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-03-08 14:01:23 +00:00
11 changed files with 49 additions and 89 deletions

3
tmux.h
View File

@ -1510,6 +1510,9 @@ void printflike(3, 4) format_add(struct format_tree *, const char *,
const char *, ...);
char *format_expand_time(struct format_tree *, const char *, time_t);
char *format_expand(struct format_tree *, const char *);
char *format_single(struct cmdq_item *, const char *,
struct client *, struct session *, struct winlink *,
struct window_pane *);
void format_defaults(struct format_tree *, struct client *,
struct session *, struct winlink *, struct window_pane *);
void format_defaults_window(struct format_tree *, struct window *);