# Conflicts: # src/crashlog.cpp # src/gfx.cpp # src/network/network_client.cpp # src/openttd.cpp # src/openttd.h # src/saveload/saveload.cpp # src/survey.cpp