Merge branch 'obsd-master'

Conflicts:
	Makefile
	cmd-list-commands.c
	cmd-suspend-client.c
	job.c
	tmux.h
	xmalloc.c
This commit is contained in:
Thomas Adam
2014-10-21 07:11:44 +01:00
100 changed files with 432 additions and 757 deletions

View File

@ -31,7 +31,7 @@ void server_callback_identify(int, short, void *);
void
server_fill_environ(struct session *s, struct environ *env)
{
char var[MAXPATHLEN], *term;
char var[PATH_MAX], *term;
u_int idx;
long pid;