Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii

src/CMakeLists.txt

src/Makefile

src/android/i_video.c

src/blua/liolib.c

src/console.c

src/console.h

src/d_main.c

src/d_netcmd.c

src/d_netcmd.h

src/deh_lua.c

src/deh_lua.h

src/deh_soc.c

src/deh_soc.h

src/deh_tables.c

src/deh_tables.h

src/dehacked.c

src/dehacked.h

src/doomdef.h

src/doomstat.h

src/dummy/i_video.c