Jonathan G Rennison
a98a56669b
Merge branch 'master' into jgrpp
# Conflicts:
# regression/regression/result.txt
# src/autoreplace_cmd.cpp
# src/industry_gui.cpp
# src/landscape.cpp
# src/network/network_content.cpp
# src/newgrf_roadstop.cpp
# src/pathfinder/yapf/yapf_ship.cpp
# src/road_gui.cpp
# src/saveload/ai_sl.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_gui.cpp
# src/video/cocoa/cocoa_ogl.h
# src/video/sdl2_opengl_v.h
# src/video/video_driver.hpp
# src/video/win32_v.h
# src/widget_type.h
# src/widgets/dropdown.cpp
# src/widgets/dropdown_type.h
# src/window.cpp
2024-02-19 23:11:00 +00:00
..
2023-11-26 15:59:41 +00:00
2023-12-06 13:30:47 +01:00
2021-03-09 22:42:25 +01:00
2023-08-02 20:28:51 +01:00
2022-10-24 12:35:58 +02:00
2024-02-10 14:16:24 +01:00
2024-01-05 19:17:08 +01:00
2022-05-01 00:39:59 +02:00