# Conflicts: # src/cheat_gui.cpp # src/main_gui.cpp # src/network/network_gui.cpp # src/saveload/saveload.h # src/smallmap_gui.cpp # src/station_cmd.cpp # src/timetable_cmd.cpp # src/toolbar_gui.cpp # src/widget.cpp # src/widget_type.h # src/widgets/dropdown_type.h