Jonathan G Rennison 42c8f50551 Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release-linux.yml # .github/workflows/release-macos.yml # .github/workflows/release-windows.yml # .gitignore # COMPILING.md # src/company_gui.cpp # src/date_gui.cpp # src/engine.cpp # src/engine_func.h # src/fileio.cpp # src/linkgraph/linkgraph_gui.h # src/newgrf_debug_gui.cpp # src/newgrf_gui.cpp # src/order_gui.cpp # src/osk_gui.cpp # src/rail_gui.cpp # src/road_gui.cpp # src/script/api/script_event_types.hpp # src/sl/oldloader_sl.cpp # src/smallmap_gui.cpp # src/station_cmd.cpp # src/toolbar_gui.cpp # src/town_gui.cpp # src/transparency_gui.cpp # src/vehicle_gui.cpp # src/widget.cpp # src/widget_type.h # src/widgets/dropdown.cpp # src/widgets/dropdown_func.h # src/widgets/dropdown_type.h # src/widgets/group_widget.h # src/widgets/vehicle_widget.h # src/window.cpp # src/window_gui.h # src/window_type.h		2024-01-02 14:44:33 +00:00
..
emscripten	Codechange: vendor the nlohmann-json library (#11290)	2023-11-17 19:20:35 +00:00
linux	Fix: [CI] patch in SHF_COMPRESSED symbol for our Linux Generic binaries (#11651)	2023-12-30 14:40:09 +01:00
macosx	Merge branch 'master' into jgrpp	2023-09-12 20:06:47 +01:00
steam
windows	Remove: officially mark Vista as no longer supported (#11531)	2023-12-02 23:11:00 +00:00