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-08-02 20:28:51 +01:00
2020-09-25 14:43:13 +01:00
2023-08-19 10:18:31 +01:00
2023-08-19 10:18:31 +01:00
2023-12-13 18:01:54 +00:00
2023-11-20 22:27:05 +00:00
2021-04-24 21:16:06 +02:00
2021-02-22 23:17:45 +01:00
2020-09-25 14:43:13 +01:00
2021-02-07 12:54:02 +01:00
2023-02-20 21:11:55 +00:00
2020-06-28 21:57:02 +01:00
2020-07-01 00:25:50 +01:00
2020-06-28 21:57:02 +01:00
2023-02-20 23:42:55 +00:00
2020-09-25 14:43:13 +01:00
2020-09-25 14:43:13 +01:00
2020-09-25 14:43:13 +01:00
2020-06-05 19:36:05 +02:00
2023-05-01 22:17:56 +02:00
2020-06-30 09:43:00 +01:00
2023-05-01 22:17:56 +02:00
2023-08-20 17:16:08 +02:00
2020-06-28 21:57:02 +01:00
2021-02-08 23:23:24 +00:00
2020-06-28 21:57:02 +01:00
2020-06-28 21:57:02 +01:00
2023-08-14 00:20:04 +01:00
2020-09-25 14:43:13 +01:00
2020-06-28 21:57:02 +01:00
2020-11-26 19:06:03 +00:00
2021-03-01 18:08:28 +00:00
2023-12-17 00:37:16 +00:00
2023-12-13 18:01:54 +00:00
2022-10-03 20:32:26 +01:00
2023-05-14 23:22:02 +02:00
2020-12-19 18:26:29 +01:00
2021-03-13 12:00:40 +00:00
2020-06-05 19:36:05 +02:00
2022-04-19 02:11:42 +02:00
2023-12-13 18:01:54 +00:00
2020-09-25 14:43:13 +01:00