circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 22:43:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	cfg.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-09-06 20:47:50 +01:00
parent 2ebef95994 aceae73b9a
commit 76688d2040
17 changed files with 346 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server-client.c
View File

@ -1069,7 +1069,7 @@ server_client_msg_dispatch(struct client *c)
s = c->session;
if (gettimeofday(&c->activity_time, NULL) != 0)
fatal("gettimeofday");
fatal("gettimeofday failed");
if (s != NULL)
session_update_activity(s, &c->activity_time);