Merge branch 'obsd-master'

Conflicts:
	tmux.h
This commit is contained in:
Thomas Adam
2015-11-21 14:24:33 +00:00
11 changed files with 208 additions and 112 deletions

1
utf8.c
View File

@ -354,6 +354,7 @@ utf8_set(struct utf8_data *ud, u_char ch)
u_int i;
*ud->data = ch;
ud->have = 1;
ud->size = 1;
ud->width = 1;