Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-11-24 10:01:13 +00:00
2 changed files with 3 additions and 0 deletions

1
tmux.h
View File

@ -1396,6 +1396,7 @@ enum options_table_type {
OPTIONS_TABLE_STYLE
};
enum options_table_scope {
OPTIONS_TABLE_NONE,
OPTIONS_TABLE_SERVER,
OPTIONS_TABLE_SESSION,
OPTIONS_TABLE_WINDOW,