Merge branch 'master' into sixel

This commit is contained in:
Nicholas Marriott
2019-12-04 19:27:16 +00:00
10 changed files with 49 additions and 27 deletions

View File

@@ -1579,7 +1579,7 @@ server_client_check_exit(struct client *c)
/* Redraw timer callback. */
static void
server_client_redraw_timer(__unused int fd, __unused short events,
__unused void* data)
__unused void *data)
{
log_debug("redraw timer fired");
}