Merge branch 'obsd-master'

Conflicts:
	client.c
	tmux.1
	tmux.c
This commit is contained in:
Thomas Adam
2015-06-07 23:42:25 +01:00
20 changed files with 624 additions and 266 deletions

2
cfg.c
View File

@ -107,7 +107,7 @@ cfg_default_done(unused struct cmd_q *cmdq)
*/
if (!TAILQ_EMPTY(&cfg_client->cmdq->queue))
cmdq_continue(cfg_client->cmdq);
cfg_client->references--;
server_client_unref(cfg_client);
cfg_client = NULL;
}
}