Jonathan G Rennison
3a47b421b0
Merge branch 'master' into jgrpp
# Conflicts:
# src/company_cmd.cpp
# src/core/overflowsafe_type.hpp
# src/economy.cpp
# src/engine_base.h
# src/ground_vehicle.cpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/industry_gui.cpp
# src/newgrf_commons.cpp
# src/newgrf_engine.cpp
# src/newgrf_industries.cpp
# src/newgrf_object.cpp
# src/newgrf_roadstop.cpp
# src/newgrf_station.cpp
# src/rail_gui.cpp
# src/road_cmd.h
# src/road_gui.cpp
# src/saveload/afterload.cpp
# src/script/api/script_log.cpp
# src/script/api/script_log.hpp
# src/settings_gui.cpp
# src/settingsgen/settingsgen.cpp
# src/station_cmd.cpp
# src/station_cmd.h
# src/station_gui.cpp
# src/strgen/strgen.cpp
# src/string_func.h
# src/string_type.h
# src/table/settings/network_private_settings.ini
# src/tests/math_func.cpp
# src/textfile_gui.cpp
# src/timetable_gui.cpp
# src/town_cmd.cpp
# src/vehicle.cpp
# src/waypoint_cmd.cpp
# src/waypoint_cmd.h
# src/widgets/dropdown.cpp
2023-06-03 19:16:57 +01:00
..
2023-05-31 23:21:38 +01:00
2021-08-23 19:37:51 +02:00
2023-05-30 00:49:24 +01:00
2021-11-03 00:45:12 +00:00
2023-04-26 07:14:03 -04:00
2023-05-30 00:49:24 +01:00
2023-05-04 23:23:32 +02:00
2022-11-13 01:08:39 +00:00
2023-05-23 22:21:19 +01:00
2023-06-03 19:16:57 +01:00
2022-12-04 20:43:11 +00:00
2023-03-04 01:17:27 +00:00
2023-03-04 01:17:27 +00:00
2021-12-06 19:33:36 +00:00
2021-08-18 12:06:14 +02:00
2023-04-15 13:58:55 +02:00
2021-09-22 21:50:02 +01:00
2021-10-03 11:02:28 +02:00
2023-06-03 19:16:57 +01:00
2023-04-26 07:14:03 -04:00
2023-02-24 22:50:11 +01:00
2021-11-03 00:45:12 +00:00
2021-11-02 19:23:24 +00:00
2023-04-25 17:55:09 +02:00
2022-11-13 01:08:39 +00:00
2021-09-05 18:17:39 +02:00
2021-09-05 18:17:39 +02:00
2021-12-04 18:32:06 +01:00
2021-09-05 18:17:39 +02:00
2021-11-03 00:45:12 +00:00
2023-05-04 13:14:12 +00:00
2021-07-10 20:17:07 +02:00
2023-04-26 07:14:03 -04:00
2019-11-12 18:43:10 +00:00