diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-09-06 20:47:50 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-09-06 20:47:50 +0100 |
| commit | 76688d204071b76fd3388e46e944e4b917c09625 (patch) | |
| tree | b6c7920003106991bbb8db46a432e47b16429c94 /server-client.c | |
| parent | 2ebef95994953e49ae84862a65f9ee649a72e200 (diff) | |
| parent | aceae73b9a401c0b124a3534079e9c0d998f0dbd (diff) | |
| download | rtmux-76688d204071b76fd3388e46e944e4b917c09625.tar.gz rtmux-76688d204071b76fd3388e46e944e4b917c09625.tar.bz2 rtmux-76688d204071b76fd3388e46e944e4b917c09625.zip | |
Merge branch 'obsd-master'
Conflicts:
cfg.c
tmux.c
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server-client.c b/server-client.c index 632c5f99..c63c11d1 100644 --- a/server-client.c +++ b/server-client.c @@ -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); |