Merge branch 'obsd-master'

Conflicts:
	cfg.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-09-06 20:47:50 +01:00
17 changed files with 346 additions and 374 deletions

View File

@ -186,7 +186,7 @@ session_free(unused int fd, unused short events, void *arg)
{
struct session *s = arg;
log_debug("sesson %s freed (%d references)", s->name, s->references);
log_debug("session %s freed (%d references)", s->name, s->references);
if (s->references == 0) {
free(s->name);