Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-11-12 12:01:17 +00:00
30 changed files with 451 additions and 340 deletions

View File

@ -1116,7 +1116,7 @@ window_pane_reset_mode(struct window_pane *wp)
void
window_pane_key(struct window_pane *wp, struct client *c, struct session *s,
int key, struct mouse_event *m)
key_code key, struct mouse_event *m)
{
struct window_pane *wp2;