Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-06-17 20:01:12 +01:00
6 changed files with 75 additions and 40 deletions

1
tmux.h
View File

@ -2170,6 +2170,7 @@ struct window_pane *window_pane_find_right(struct window_pane *);
void window_set_name(struct window *, const char *);
void window_remove_ref(struct window *);
void winlink_clear_flags(struct winlink *);
int winlink_shuffle_up(struct session *, struct winlink *);
/* layout.c */
u_int layout_count_cells(struct layout_cell *);