Merge branch 'obsd-master'

Conflicts:
	format.c
This commit is contained in:
Thomas Adam
2014-12-19 19:20:09 +00:00
6 changed files with 33 additions and 3 deletions

View File

@ -442,6 +442,7 @@ server_child_exited(pid_t pid, int status)
continue;
TAILQ_FOREACH(wp, &w->panes, entry) {
if (wp->pid == pid) {
wp->status = status;
server_destroy_pane(wp);
break;
}