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-03-26 09:35:44 +02:00
2021-11-01 18:54:43 +00:00
2024-02-15 23:49:11 +00:00
2021-08-15 14:14:13 +02:00
2019-08-31 21:20:24 +02:00
2024-02-10 21:01:34 +01:00
2023-04-17 17:59:16 +02:00
2023-03-08 22:33:47 +01:00