Merge branch 'master' into jgrpp
# Conflicts: # src/network/network_server.cpp
This commit is contained in:
@@ -526,9 +526,9 @@ cat = SC_BASIC
|
||||
var = gui.liveries
|
||||
type = SLE_UINT8
|
||||
flags = SF_NOT_IN_SAVE | SF_NO_NETWORK_SYNC | SF_GUI_DROPDOWN
|
||||
def = 2
|
||||
min = 0
|
||||
max = 2
|
||||
def = LIT_ALL
|
||||
min = LIT_NONE
|
||||
max = LIT_ALL
|
||||
str = STR_CONFIG_SETTING_LIVERIES
|
||||
strhelp = STR_CONFIG_SETTING_LIVERIES_HELPTEXT
|
||||
strval = STR_CONFIG_SETTING_LIVERIES_NONE
|
||||
|
Reference in New Issue
Block a user