Merge branch 'obsd-master'

Conflicts:
	server.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-14 11:38:30 +00:00
12 changed files with 116 additions and 67 deletions

View File

@ -129,7 +129,7 @@ cmd_save_buffer_exec(struct cmd *self, struct cmd_q *cmdq)
do_stdout:
evbuffer_add(c->stdout_data, bufdata, bufsize);
server_push_stdout(c);
server_client_push_stdout(c);
return (CMD_RETURN_NORMAL);
do_print: