Merge branch 'obsd-master'

Conflicts:
	server.c
	tmux.c
This commit is contained in:
Thomas Adam
2015-11-23 21:20:54 +00:00
6 changed files with 15 additions and 15 deletions

View File

@ -197,7 +197,7 @@ const struct options_table_entry options_table[] = {
{ .name = "display-time",
.type = OPTIONS_TABLE_NUMBER,
.scope = OPTIONS_TABLE_SESSION,
.minimum = 1,
.minimum = 0,
.maximum = INT_MAX,
.default_num = 750
},