Merge branch 'obsd-master'

Conflicts:
	cmd-find.c
This commit is contained in:
Thomas Adam
2015-10-25 09:21:37 +00:00
12 changed files with 78 additions and 19 deletions

1
tmux.h
View File

@ -2083,6 +2083,7 @@ 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_start_drag(struct client *, struct mouse_event *);
int window_copy_scroll_position(struct window_pane *);
/* window-choose.c */
extern const struct window_mode window_choose_mode;