# Conflicts: # src/base_station_base.h # src/newgrf_roadstop.cpp # src/newgrf_station.cpp # src/object_gui.cpp # src/saveload/settings_sl.cpp # src/saveload/station_sl.cpp # src/settings.cpp # src/settings_internal.h # src/timer/timer_game_calendar.cpp
See: eaae0bb5e
eaae0bb5e
Leave afterload in src/saveload/