Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2018-03-16 16:02:28 +00:00
3 changed files with 15 additions and 9 deletions

2
tmux.h
View File

@ -2149,7 +2149,7 @@ int window_has_pane(struct window *, struct window_pane *);
int window_set_active_pane(struct window *, struct window_pane *);
void window_redraw_active_switch(struct window *,
struct window_pane *);
struct window_pane *window_add_pane(struct window *, struct window_pane *,
struct window_pane *window_add_pane(struct window *, struct window_pane *, int,
int, u_int);
void window_resize(struct window *, u_int, u_int);
int window_zoom(struct window_pane *);