Merge branch 'master' into next

SRB2.cbp

Srb2.dev

libs/fmodex/lib/libfmodex64_vc.a

libs/fmodex/lib/libfmodexL64_vc.a

libs/fmodex/lib/libfmodexL_vc.a

libs/fmodex/lib/libfmodex_vc.a

src/Makefile

src/Makefile.cfg

src/console.c

src/d_main.c

src/d_netcmd.c

src/doomdef.h

src/hardware/hw3dsdrv.h

src/hardware/hw_data.h

src/hardware/hw_drv.h

src/hardware/r_opengl/r_opengl.c

src/hardware/r_opengl/r_opengl.h

src/hardware/s_ds3d/s_ds3d.c

src/hardware/s_fmod/s_fmod.c

src/hardware/s_openal/s_openal.c