Merge branch 'obsd-master'

Conflicts:
	tmux.1
	window.c
This commit is contained in:
Thomas Adam
2017-06-05 11:59:38 +01:00
13 changed files with 144 additions and 26 deletions

6
proc.c
View File

@ -263,3 +263,9 @@ proc_kill_peer(struct tmuxpeer *peer)
{
peer->flags |= PEER_BAD;
}
void
proc_toggle_log(struct tmuxproc *tp)
{
log_toggle(tp->name);
}