Merge branch 'obsd-master'

Conflicts:
	cmd-find.c
This commit is contained in:
Thomas Adam
2015-10-25 09:21:37 +00:00
12 changed files with 78 additions and 19 deletions

View File

@ -100,7 +100,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_q *cmdq)
strerror(errno));
return (CMD_RETURN_ERROR);
}
} else if (cp != NULL)
} else
free(cp);
cwd = fd;
} else if (cmdq->client != NULL && cmdq->client->session == NULL)