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

View File

@ -301,7 +301,7 @@ window_create1(u_int sx, u_int sy)
w->references = 0;
w->id = next_window_id++;
RB_INSERT (windows, &windows, w);
RB_INSERT(windows, &windows, w);
return (w);
}