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-04-16 20:14:22 +02:00
2023-05-31 23:50:09 +01:00
2023-02-11 23:05:22 +00:00
2023-05-30 18:57:42 +01:00
2023-04-18 00:01:50 +01:00
2023-06-03 19:16:57 +01:00
2023-02-05 19:27:25 +01:00
2022-11-26 23:04:14 +00:00
2022-12-03 22:28:49 +00:00
2022-11-08 21:11:16 +01:00
2023-02-28 12:20:41 -05:00
2022-11-10 21:39:09 +01:00
2022-12-03 22:28:49 +00:00
2022-11-12 18:28:39 +00:00
2022-11-12 18:28:39 +00:00
2022-12-17 23:19:23 +00:00
2023-05-05 17:21:44 +01:00
2023-02-26 21:28:30 +01:00
2023-02-05 19:27:25 +01:00
2023-05-01 12:58:22 +01:00
2022-11-12 18:28:39 +00:00
2022-11-16 19:02:51 +00:00
2022-12-28 01:46:29 +00:00
2023-03-15 19:44:26 +00:00
2023-05-25 22:35:05 +01:00