Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-12-07 10:01:09 +00:00
3 changed files with 35 additions and 11 deletions

1
tmux.h
View File

@ -1759,6 +1759,7 @@ const char *key_string_lookup_key(key_code);
/* alerts.c */
void alerts_reset_all(void);
void alerts_queue(struct window *, int);
void alerts_check_session(struct session *);
/* server.c */
extern struct tmuxproc *server_proc;