Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2021-10-01 23:42:21 +03:00
21 changed files with 407 additions and 750 deletions
-1
View File
@@ -1640,7 +1640,6 @@ static SettingsContainer &GetSettingsTree()
viewports->Add(new SettingEntry("gui.measure_tooltip"));
viewports->Add(new SettingEntry("gui.loading_indicators"));
viewports->Add(new SettingEntry("gui.show_track_reservation"));
viewports->Add(new SettingEntry("gui.cm_cb_distance"));
viewports->Add(new SettingEntry("gui.cm_land_tooltips_for_industries"));
viewports->Add(new SettingEntry("gui.cm_land_tooltips_for_stations"));
viewports->Add(new SettingEntry("gui.cm_land_tooltips_for_houses"));