Merge branch 'next' into font_drawer

extras/conf/SRB2-22.cfg

extras/conf/udb/Includes/SRB222_common.cfg

extras/conf/udb/Includes/SRB222_linedefs.cfg

extras/conf/udb/Includes/SRB222_misc.cfg

extras/conf/udb/Includes/SRB222_sectors.cfg

extras/conf/udb/Includes/SRB222_things.cfg

extras/conf/udb/SRB2_22Doom.cfg

extras/conf/udb/SRB2_22UDMF.cfg

libs/FMOD.props

libs/dll-binaries/i686/Old/fmod.dll

libs/dll-binaries/i686/Old/fmodexL.dll

libs/dll-binaries/i686/fmodex.dll

libs/dll-binaries/x86_64/Old/fmod64.dll

libs/dll-binaries/x86_64/Old/fmodexL64.dll

libs/dll-binaries/x86_64/fmodex64.dll

libs/fmodex/inc/fmod.h

libs/fmodex/inc/fmod_codec.h

libs/fmodex/inc/fmod_dsp.h

libs/fmodex/inc/fmod_errors.h

libs/fmodex/inc/fmod_memoryinfo.h