Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-09-25 18:01:09 +01:00
3 changed files with 18 additions and 7 deletions

1
tmux.h
View File

@ -1843,6 +1843,7 @@ int grid_compare(struct grid *, struct grid *);
void grid_collect_history(struct grid *);
void grid_scroll_history(struct grid *);
void grid_scroll_history_region(struct grid *, u_int, u_int);
void grid_clear_history(struct grid *);
void grid_expand_line(struct grid *, u_int, u_int);
const struct grid_cell *grid_peek_cell(struct grid *, u_int, u_int);
const struct grid_line *grid_peek_line(struct grid *, u_int);