Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-04-21 18:01:11 +01:00
2 changed files with 32 additions and 24 deletions

1
tmux.h
View File

@ -1851,7 +1851,6 @@ void server_client_set_identify(struct client *);
void server_client_clear_identify(struct client *, struct window_pane *);
void server_client_set_key_table(struct client *, const char *);
const char *server_client_get_key_table(struct client *);
int server_client_is_default_key_table(struct client *);
int server_client_check_nested(struct client *);
void server_client_handle_key(struct client *, key_code);
void server_client_create(int);