Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-05-01 16:01:11 +01:00
3 changed files with 24 additions and 34 deletions

2
tmux.h
View File

@ -2221,7 +2221,7 @@ void window_copy_init_from_pane(struct window_pane *, int);
void window_copy_init_for_output(struct window_pane *);
void printflike(2, 3) window_copy_add(struct window_pane *, const char *, ...);
void window_copy_vadd(struct window_pane *, const char *, va_list);
void window_copy_pageup(struct window_pane *);
void window_copy_pageup(struct window_pane *, int);
void window_copy_start_drag(struct client *, struct mouse_event *);
int window_copy_scroll_position(struct window_pane *);