Jonathan G Rennison
88670a230f
Merge branch 'master' into jgrpp
# Conflicts:
# src/articulated_vehicles.cpp
# src/articulated_vehicles.h
# src/base_media_base.h
# src/base_media_func.h
# src/build_vehicle_gui.cpp
# src/dock_gui.cpp
# src/main_gui.cpp
# src/music_gui.cpp
# src/network/network_chat_gui.cpp
# src/network/network_content.cpp
# src/newgrf.cpp
# src/newgrf_roadstop.cpp
# src/os/windows/string_uniscribe.h
# src/os/windows/win32.cpp
# src/rail_gui.cpp
# src/road.cpp
# src/road_gui.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.cpp
# src/strings.cpp
# src/terraform_gui.cpp
# src/tests/test_script_admin.cpp
# src/tests/test_window_desc.cpp
# src/timer/timer_game_calendar.h
# src/vehicle.cpp
# src/vehicle_base.h
# src/viewport.cpp
# src/widget_type.h
# src/window.cpp
# src/window_gui.h
2023-11-29 20:42:29 +00:00
..
2023-11-25 13:30:06 +00:00
2023-08-28 19:58:17 +01:00
2023-11-20 22:27:05 +00:00
2023-07-19 19:30:14 +02:00
2023-09-10 08:40:25 -04:00
2023-11-29 20:42:29 +00:00
2023-11-29 20:42:29 +00:00
2023-07-19 19:30:14 +02:00
2023-09-23 12:05:05 +01:00
2023-11-29 20:42:29 +00:00
2023-11-25 13:30:06 +00:00
2023-11-20 22:27:05 +00:00
2023-11-20 22:27:05 +00:00
2023-11-25 13:30:06 +00:00
2023-07-19 19:30:14 +02:00
2023-11-20 22:27:05 +00:00
2023-05-19 11:24:44 +02:00
2023-09-02 19:46:52 +02:00
2023-11-29 20:42:29 +00:00
2023-11-25 13:30:06 +00:00
2023-11-13 23:44:36 +00:00
2023-11-20 22:27:05 +00:00
2023-07-03 23:44:54 +01:00
2023-11-20 22:27:05 +00:00
2023-11-20 22:27:05 +00:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2023-11-20 22:27:05 +00:00
2023-11-17 19:17:14 +00:00
2023-08-28 19:58:17 +01:00
2023-11-20 22:27:05 +00:00
2023-07-19 19:30:14 +02:00
2023-07-19 19:30:14 +02:00
2023-11-20 22:27:05 +00:00
2021-07-10 20:17:07 +02:00
2023-11-25 13:30:06 +00:00
2019-11-12 18:43:10 +00:00