Merge branch 'master' into jgrpp
# Conflicts: # .github/workflows/ci-build.yml # .github/workflows/commit-checker.yml # src/command.cpp # src/company_cmd.cpp # src/company_gui.cpp # src/crashlog.cpp # src/economy.cpp # src/lang/english.txt # src/lang/german.txt # src/lang/korean.txt # src/misc_gui.cpp # src/newgrf_config.cpp # src/openttd.cpp # src/settings_gui.cpp # src/ship_cmd.cpp # src/table/settings/gui_settings.ini
This commit is contained in:
@@ -212,7 +212,6 @@ struct GUISettings : public TimeSettings {
|
||||
bool station_dragdrop; ///< whether drag and drop is enabled for stations
|
||||
bool station_show_coverage; ///< whether to highlight coverage area
|
||||
bool persistent_buildingtools; ///< keep the building tools active after usage
|
||||
bool expenses_layout; ///< layout of expenses window
|
||||
uint32 last_newgrf_count; ///< the numbers of NewGRFs we found during the last scan
|
||||
byte missing_strings_threshold; ///< the number of missing strings before showing the warning
|
||||
uint8 graph_line_thickness; ///< the thickness of the lines in the various graph guis
|
||||
|
Reference in New Issue
Block a user