Jonathan G Rennison 0691b25e17 Merge branch 'master' into jgrpp ... # Conflicts: # src/saveload/afterload.cpp		2021-11-20 13:15:32 +00: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
steam
windows	Change: Explicitly specify SHA1 for legacy code signing on Windows	2021-11-10 10:26:33 +00:00