Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-11-15 20:01:22 +00:00
5 changed files with 293 additions and 197 deletions

2
tmux.h
View File

@ -2000,7 +2000,7 @@ char *grid_string_cells(struct grid *, u_int, u_int, u_int,
struct grid_cell **, int, int, int);
void grid_duplicate_lines(struct grid *, u_int, struct grid *, u_int,
u_int);
u_int grid_reflow(struct grid *, struct grid *, u_int);
void grid_reflow(struct grid *, u_int, u_int *);
/* grid-view.c */
void grid_view_get_cell(struct grid *, u_int, u_int, struct grid_cell *);