Jonathan G Rennison a1f6aaa58f Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/korean.txt # src/saveload/afterload.cpp # src/saveload/ai_sl.cpp # src/saveload/game_sl.cpp # src/script/script_instance.cpp		2022-12-31 18:17:24 +00:00
..
emscripten	Update: emsdk to 3.1.28 and lzma (for emsdk) to 5.4.0 (#10234)	2022-12-29 23:34:45 +01: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 #9993: Handle DPI changes on macOS and Windows	2022-10-16 16:52:14 +02:00