Merge branch 'cpp-11' into save_ext

This commit is contained in:
Jonathan G Rennison
2019-01-13 23:30:52 +00:00
144 changed files with 1021 additions and 328 deletions

View File

@@ -1584,6 +1584,7 @@ static SettingsContainer &GetSettingsTree()
company->Add(new SettingEntry("gui.drag_signals_fixed_distance"));
company->Add(new SettingEntry("gui.new_nonstop"));
company->Add(new SettingEntry("gui.stop_location"));
company->Add(new SettingEntry("gui.starting_colour"));
company->Add(new SettingEntry("company.engine_renew"));
company->Add(new SettingEntry("company.engine_renew_months"));
company->Add(new SettingEntry("company.engine_renew_money"));