Jonathan G Rennison
6459e62fff
Merge branch 'master' into jgrpp
# Conflicts:
# src/lang/english.txt
# src/map_type.h
# src/network/network_command.cpp
# src/object_cmd.cpp
# src/rail_cmd.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/settings_gui.cpp
# src/string.cpp
# src/table/road_land.h
# src/table/settings/game_settings.ini
# src/table/settings/world_settings.ini
# src/tbtr_template_gui_main.h
# src/train_cmd.cpp
2022-11-05 19:24:44 +00:00
..
2021-06-13 12:45:45 +02:00
2022-11-05 15:42:20 +01:00
2020-09-25 14:43:13 +01:00
2021-06-13 12:45:45 +02:00
2022-11-05 15:42:20 +01:00
2019-11-10 17:59:20 +00:00
2020-12-08 10:24:59 +01:00
2020-05-21 20:02:34 +02:00
2020-05-21 20:02:34 +02:00
2022-11-05 15:42:20 +01:00
2020-12-08 10:24:59 +01:00
2021-06-10 23:17:29 +02:00
2022-11-05 15:42:20 +01:00
2021-11-09 01:08:28 +00:00
2022-11-05 15:42:20 +01:00