Jonathan G Rennison
ae9b416684
Merge branch 'master' into jgrpp
# Conflicts:
# src/ai/ai_core.cpp
# src/ai/ai_gui.cpp
# src/ai/ai_instance.cpp
# src/console_cmds.cpp
# src/engine_type.h
# src/game/game_gui.cpp
# src/game/game_instance.cpp
# src/goal.cpp
# src/goal_cmd.h
# src/lang/english.txt
# src/lang/estonian.txt
# src/network/network_client.cpp
# src/newgrf.cpp
# src/newgrf_generic.h
# src/openttd.cpp
# src/saveload/saveload.h
# src/script/api/script_log.cpp
# src/script/api/script_town.cpp
# src/settings_table.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_map.h
# src/strings.cpp
# src/table/settings/difficulty_settings.ini
# src/table/settings/gui_settings.ini
# src/tbtr_template_gui_main.h
# src/timetable_cmd.cpp
# src/timetable_cmd.h
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_gui.cpp
# src/water_cmd.cpp
2023-02-11 23:05:22 +00:00
..
2021-01-08 11:16:18 +01:00
2019-11-10 17:59:20 +00:00
2023-02-11 23:05:22 +00:00
2023-02-11 23:05:22 +00:00
2023-02-05 19:27:25 +01:00
2023-01-02 01:23:36 +00:00
2019-11-10 17:59:20 +00:00
2023-02-11 23:05:22 +00:00
2021-12-16 22:28:32 +01:00
2023-02-11 23:05:22 +00:00
2019-11-10 17:59:20 +00:00
2023-02-05 19:27:25 +01:00
2020-06-05 19:36:05 +02:00