Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-10-14 00:01:13 +01:00
3 changed files with 0 additions and 22 deletions

View File

@ -319,12 +319,6 @@ const struct options_table_entry options_table[] = {
.default_num = 500
},
{ .name = "set-remain-on-exit",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_SESSION,
.default_num = 0
},
{ .name = "set-titles",
.type = OPTIONS_TABLE_FLAG,
.scope = OPTIONS_TABLE_SESSION,