Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-16 00:01:10 +00:00
11 changed files with 31 additions and 45 deletions

3
tmux.h
View File

@ -1825,8 +1825,7 @@ void printflike(2, 3) cmdq_print(struct cmdq_item *, const char *, ...);
void printflike(2, 3) cmdq_error(struct cmdq_item *, const char *, ...);
/* cmd-string.c */
int cmd_string_parse(const char *, struct cmd_list **, const char *,
u_int, char **);
struct cmd_list *cmd_string_parse(const char *, const char *, u_int, char **);
/* cmd-wait-for.c */
void cmd_wait_for_flush(void);