Merge branch 'obsd-master'

This commit is contained in:
Thomas
2013-03-25 16:30:37 +00:00
7 changed files with 33 additions and 49 deletions

View File

@ -501,11 +501,6 @@ const struct options_table_entry window_options_table[] = {
.default_num = 1
},
{ .name = "command-prefix",
.type = OPTIONS_TABLE_STRING,
.default_str = "exec "
},
{ .name = "force-height",
.type = OPTIONS_TABLE_NUMBER,
.minimum = 0,