Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-08-02 11:02:25 +01:00
2 changed files with 17 additions and 13 deletions

1
tmux.h
View File

@ -1361,6 +1361,7 @@ struct client {
void (*identify_callback)(struct client *,
struct window_pane *);
void *identify_callback_data;
struct cmdq_item *identify_callback_item;
char *message_string;
struct event message_timer;