Jonathan G Rennison 2ed248a61d Merge branch 'master' into jgrpp ... # Conflicts: # .github/workflows/ci-build.yml # .github/workflows/release-linux.yml # src/aircraft_cmd.cpp # src/airport_gui.cpp # src/articulated_vehicles.cpp # src/build_vehicle_gui.cpp # src/company_gui.cpp # src/genworld_gui.cpp # src/gfx_layout.cpp # src/misc_gui.cpp # src/newgrf.cpp # src/newgrf_config.h # src/newgrf_engine.cpp # src/news_gui.cpp # src/order_gui.cpp # src/roadveh_cmd.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/ship_cmd.cpp # src/statusbar_gui.cpp # src/table/settings/network_private_settings.ini # src/table/settings/network_settings.ini # src/toolbar_gui.cpp # src/train_cmd.cpp # src/vehicle_gui.cpp		2023-05-31 23:21:38 +01:00
..
emscripten	Change: [CI] update emscripten and liblzma to the latest version (#10757)	2023-05-02 23:12:52 +02:00
macosx	Change: Set minimum macOS version to 10.13 (#10253)	2022-12-17 18:35:45 +01:00
os2	Change: Heading for 1.11 now	2020-02-08 23:38:49 +01:00
steam	Add: [Actions] Automatically upload releases to Steam (#8644)	2021-02-05 20:58:15 +01:00
windows	Fix: Ensure logo for Windows Store common assets package is named correctly	2023-02-07 09:23:44 +00:00