Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-05-01 14:01:12 +01:00
4 changed files with 6 additions and 7 deletions

1
tmux.h
View File

@ -1727,7 +1727,6 @@ void tty_close(struct tty *);
void tty_free(struct tty *);
void tty_write(void (*)(struct tty *, const struct tty_ctx *),
struct tty_ctx *);
int tty_client_ready(struct client *, struct window_pane *wp);
void tty_cmd_alignmenttest(struct tty *, const struct tty_ctx *);
void tty_cmd_cell(struct tty *, const struct tty_ctx *);
void tty_cmd_clearendofline(struct tty *, const struct tty_ctx *);