Merge branch 'master' into jgrpp
# Conflicts: # src/order_cmd.cpp # src/table/settings/news_display_settings.ini
This commit is contained in:
@@ -1866,6 +1866,7 @@ static SettingsContainer &GetSettingsTree()
|
||||
advisors->Add(new SettingEntry("news_display.general"));
|
||||
advisors->Add(new SettingEntry("news_display.new_vehicles"));
|
||||
advisors->Add(new SettingEntry("news_display.accident"));
|
||||
advisors->Add(new SettingEntry("news_display.accident_other"));
|
||||
advisors->Add(new SettingEntry("news_display.company_info"));
|
||||
advisors->Add(new SettingEntry("news_display.acceptance"));
|
||||
advisors->Add(new SettingEntry("news_display.arrival_player"));
|
||||
|
Reference in New Issue
Block a user