Files
openttd/src/ai
Jonathan G Rennison 1f36c3f3e4 Merge branch 'master' into jgrpp
# Conflicts:
#	src/ai/ai_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/genworld_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/newgrf_sound.cpp
#	src/roadveh.h
#	src/sound.cpp
#	src/station_cmd.cpp
#	src/train.h
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_base.h
#	src/vehicle_gui.cpp
2022-11-26 23:04:14 +00:00
..
2019-11-10 17:59:20 +00:00
2022-10-16 20:14:13 +01:00
2022-11-26 23:04:14 +00:00
2019-11-10 17:59:20 +00:00
2019-11-10 17:59:20 +00:00