Merge remote-tracking branch 'origin/master' into renderswitch

assets/CMakeLists.txt

extras/conf/SRB2-22.cfg

libs/libopenmpt/SRB2NOTE.md

libs/libopenmpt/bin/x86/libopenmpt.dll

libs/libopenmpt/bin/x86/mingw/libopenmpt.dll

libs/libopenmpt/bin/x86/openmpt-mpg123.dll

libs/libopenmpt/bin/x86/openmpt-ogg.dll

libs/libopenmpt/bin/x86/openmpt-vorbis.dll

libs/libopenmpt/bin/x86/openmpt-zlib.dll

libs/libopenmpt/bin/x86_64/libopenmpt.dll

libs/libopenmpt/bin/x86_64/mingw/libopenmpt.dll

libs/libopenmpt/bin/x86_64/openmpt-mpg123.dll

libs/libopenmpt/bin/x86_64/openmpt-ogg.dll

libs/libopenmpt/bin/x86_64/openmpt-vorbis.dll

libs/libopenmpt/bin/x86_64/openmpt-zlib.dll

libs/libopenmpt/changelog.md

libs/libopenmpt/inc/libopenmpt/libopenmpt_version.h

libs/libopenmpt/lib/x86/libopenmpt.lib

libs/libopenmpt/lib/x86/mingw/libopenmpt.dll.a

libs/libopenmpt/lib/x86_64/libopenmpt.lib