Jonathan G Rennison 0a9c44d1a2 Merge branch 'master' into jgrpp ... # Conflicts: # src/airport_gui.cpp # src/blitter/32bpp_anim_sse4.cpp # src/console_cmds.cpp # src/linkgraph/linkgraph_gui.cpp # src/newgrf_object.h # src/road_gui.cpp # src/widgets/road_widget.h # src/window.cpp		2022-10-16 20:14:13 +01:00
..
emscripten	Change: [Emscripten] update to 2.0.34 and use Release over RelWithDebInfo (#9696)	2021-11-14 16:59:49 +01:00
macosx	Add: Specify minimum version for macOS (#9689)	2021-11-11 20:06:31 +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 #9993: Handle DPI changes on macOS and Windows	2022-10-16 16:52:14 +02:00