Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-08-17 12:01:17 +01:00
3 changed files with 28 additions and 6 deletions

View File

@ -654,6 +654,12 @@ const struct options_table_entry options_table[] = {
.default_num = 0
},
{ .name = "monitor-bell",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_WINDOW,
.default_num = 1
},
{ .name = "monitor-silence",
.type = OPTIONS_TABLE_NUMBER,
.scope = OPTIONS_TABLE_WINDOW,