Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-06-07 18:01:13 +01:00
4 changed files with 5 additions and 5 deletions

4
tmux.h
View File

@ -621,7 +621,7 @@ struct job {
job_free_cb freecb;
void *data;
LIST_ENTRY(job) entry;
LIST_ENTRY(job) entry;
};
LIST_HEAD(joblist, job);
@ -680,7 +680,7 @@ struct screen_write_ctx {
struct screen_write_collect_item *item;
struct screen_write_collect_line *list;
u_int scrolled;
u_int bg;
u_int bg;
u_int cells;
u_int written;