Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-08-28 16:01:09 +01:00
10 changed files with 75 additions and 71 deletions

4
tmux.h
View File

@ -997,6 +997,8 @@ struct session {
struct timeval activity_time;
struct timeval last_activity_time;
struct event lock_timer;
u_int sx;
u_int sy;
@ -2252,7 +2254,7 @@ struct session *session_create(const char *, int, char **, const char *,
void session_destroy(struct session *);
void session_unref(struct session *);
int session_check_name(const char *);
void session_update_activity(struct session *);
void session_update_activity(struct session *, struct timeval *);
struct session *session_next_session(struct session *);
struct session *session_previous_session(struct session *);
struct winlink *session_new(struct session *, const char *, int, char **,