circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-03 16:46:18 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2015-12-12 20:01:15 +00:00
parent 5a5db02b85 5ed17e84fa
commit 845a664bb2
16 changed files with 122 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
options-table.c
View File

@@ -210,6 +210,12 @@ const struct options_table_entry options_table[] = {
.default_num = 2000
},
{ .name = "key-table",
.type = OPTIONS_TABLE_STRING,
.scope = OPTIONS_TABLE_SESSION,
.default_str = "root"
},
{ .name = "lock-after-time",
.type = OPTIONS_TABLE_NUMBER,
.scope = OPTIONS_TABLE_SESSION,