Jonathan G Rennison dd99fd646d Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/base_station_base.h
#	src/industry.h
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/lang/korean.txt
#	src/os/macosx/crashlog_osx.cpp
#	src/station_cmd.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp

2020-01-20 18:36:55 +00:00

13 KiB

Raw Blame History

View Raw