Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-08-30 20:01:11 +01:00
3 changed files with 51 additions and 31 deletions

2
tmux.h
View File

@ -1977,7 +1977,7 @@ int grid_cells_equal(const struct grid_cell *, const struct grid_cell *);
struct grid *grid_create(u_int, u_int, u_int);
void grid_destroy(struct grid *);
int grid_compare(struct grid *, struct grid *);
void grid_collect_history(struct grid *, u_int);
void grid_collect_history(struct grid *);
void grid_scroll_history(struct grid *, u_int);
void grid_scroll_history_region(struct grid *, u_int, u_int, u_int);
void grid_clear_history(struct grid *);