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
..
2022-12-30 00:14:40 +00:00
2022-01-21 23:34:39 +00:00
2023-05-09 23:02:06 +02:00
2022-12-25 18:03:39 -05:00
2022-01-26 21:46:36 +00:00
2022-01-26 21:46:36 +00:00
2022-12-30 00:14:40 +00:00
2020-10-28 00:27:48 +00:00
2022-01-21 23:34:39 +00:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2023-05-09 23:02:06 +02:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-12-15 22:47:57 +01:00
2020-06-05 19:36:05 +02:00
2022-12-25 18:03:39 -05:00
2020-12-15 22:47:57 +01:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-06-05 19:36:05 +02:00
2020-06-28 21:57:02 +01:00
2022-01-26 21:46:36 +00:00
2020-06-28 21:57:02 +01:00
2020-06-28 21:57:02 +01:00