Merge branch 'obsd-master'

Conflicts:
	utf8.c
This commit is contained in:
Thomas Adam
2016-03-02 18:10:51 +00:00
18 changed files with 150 additions and 481 deletions

2
tmux.c
View File

@ -190,7 +190,9 @@ main(int argc, char **argv)
const char *s;
int opt, flags, keys;
setlocale(LC_CTYPE, "en_US.UTF-8");
setlocale(LC_TIME, "");
tzset();
if (**argv == '-')