Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-11-23 18:01:19 +00:00
4 changed files with 22 additions and 5 deletions

2
tmux.h
View File

@ -1837,7 +1837,7 @@ void key_bindings_remove(const char *, key_code);
void key_bindings_remove_table(const char *);
void key_bindings_init(void);
void key_bindings_dispatch(struct key_binding *, struct client *,
struct mouse_event *);
struct mouse_event *, struct cmd_find_state *);
/* key-string.c */
key_code key_string_lookup_string(const char *);