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
..
2022-05-19 00:08:15 +01:00
2022-05-19 00:08:15 +01:00
2021-02-26 18:02:13 +00:00
2019-11-10 17:59:20 +00:00
2021-02-26 18:02:13 +00:00
2019-11-10 17:59:20 +00:00
2022-08-26 19:36:18 +02:00
2022-08-26 19:36:18 +02:00
2022-10-16 20:14:13 +01:00
2022-10-16 18:55:09 +02:00
2022-05-19 00:08:15 +01:00
2022-05-19 00:08:15 +01:00
2022-05-19 00:08:15 +01:00
2022-05-19 00:08:15 +01:00
2022-06-06 00:18:08 +01:00
2021-03-04 00:17:10 +00:00
2021-06-13 12:45:45 +02:00
2019-11-10 17:59:20 +00:00
2022-06-06 00:18:08 +01:00
2022-08-26 19:36:18 +02:00
2019-11-10 17:59:20 +00:00
2022-08-26 19:36:18 +02:00
2022-10-16 20:14:13 +01:00
2022-10-16 18:55:09 +02:00
2019-11-10 17:59:20 +00:00
2022-08-26 19:36:18 +02:00
2022-11-05 19:24:44 +00:00
2022-11-05 19:24:44 +00:00
2022-05-19 00:08:15 +01:00
2022-08-26 19:36:18 +02:00
2021-05-27 18:30:56 +02:00
2021-06-13 12:45:45 +02:00
2019-11-10 17:59:20 +00:00
2022-05-19 00:08:15 +01:00