Jonathan G Rennison
5ae74ecf8e
Merge branch 'master' into jgrpp
# Conflicts:
# src/articulated_vehicles.cpp
# src/articulated_vehicles.h
# src/autoreplace_cmd.cpp
# src/build_vehicle_gui.cpp
# src/company_gui.cpp
# src/core/format.hpp
# src/genworld_gui.cpp
# src/gfx.cpp
# src/group_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/misc/endian_buffer.hpp
# src/music/music_driver.hpp
# src/newgrf_gui.cpp
# src/rail_cmd.cpp
# src/road_gui.cpp
# src/settings_type.h
# src/strgen/strgen.cpp
# src/strings.cpp
# src/timetable_cmd.cpp
# src/town.h
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/widget.cpp
# src/widgets/dropdown.cpp
# src/widgets/road_widget.h
2023-12-17 00:37:16 +00:00
..
2023-07-19 19:30:14 +02:00
2023-09-25 21:27:45 +01:00
2023-11-20 22:27:05 +00:00
2022-11-05 15:42:20 +01:00
2023-09-19 22:49:59 +02:00
2023-09-19 22:49:59 +02:00
2023-09-19 22:49:59 +02:00
2022-11-05 15:42:20 +01:00
2023-11-09 20:15:38 +00:00
2023-12-02 23:11:00 +00:00
2022-11-05 15:42:20 +01:00
2023-11-29 20:42:29 +00:00
2022-11-05 15:42:20 +01:00