circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-01 20:57:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2017-06-23 18:01:11 +01:00
parent a61200776d 95ed7d48c8
commit 6995497e5b
6 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
options-table.c
View File

@ -135,6 +135,13 @@ const struct options_table_entry options_table[] = {
.separator = ","
},
{ .name = "user-keys",
.type = OPTIONS_TABLE_ARRAY,
.scope = OPTIONS_TABLE_SERVER,
.default_str = "",
.separator = ","
},
{ .name = "assume-paste-time",
.type = OPTIONS_TABLE_NUMBER,
.scope = OPTIONS_TABLE_SESSION,