aboutsummaryrefslogtreecommitdiff
path: root/tmux.h
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2017-08-30 20:04:37 +0100
committerNicholas Marriott <nicholas.marriott@gmail.com>2017-08-30 20:04:37 +0100
commit07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab (patch)
treee2425144f608498903719c91182f34b445f0659c /tmux.h
parent07c679b52d18f198a60da2bd5b9b743bac55680f (diff)
parentf81e87f1e21f18a4d8fc01d33acb2fd86ae9f1bc (diff)
downloadrtmux-07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab.tar.gz
rtmux-07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab.tar.bz2
rtmux-07d3c4d882b378b65f8ab5e99f8fffbeb797b2ab.zip
Merge branch 'master' into 2.6-rc
Diffstat (limited to 'tmux.h')
-rw-r--r--tmux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmux.h b/tmux.h
index 9c927bb9..adc020d5 100644
--- a/tmux.h
+++ b/tmux.h
@@ -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 *);