Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-09-04 20:01:16 +01:00
5 changed files with 245 additions and 48 deletions

2
tmux.h
View File

@ -2207,7 +2207,7 @@ void layout_resize_pane_to(struct window_pane *, enum layout_type,
u_int);
void layout_assign_pane(struct layout_cell *, struct window_pane *);
struct layout_cell *layout_split_pane(struct window_pane *, enum layout_type,
int, int);
int, int, int);
void layout_close_pane(struct window_pane *);
/* layout-custom.c */