Merge branch 'obsd-master'

Conflicts:
	tmux.h
This commit is contained in:
Thomas Adam
2015-05-09 12:51:41 +01:00
20 changed files with 458 additions and 317 deletions

2
cfg.c
View File

@ -120,7 +120,7 @@ cfg_add_cause(const char *fmt, ...)
va_start(ap, fmt);
xvasprintf(&msg, fmt, ap);
va_end (ap);
va_end(ap);
cfg_ncauses++;
cfg_causes = xreallocarray(cfg_causes, cfg_ncauses, sizeof *cfg_causes);