Merge branch 'next' into allowshaders

src/Makefile

src/android/i_cdmus.c

src/android/i_video.c

src/command.c

src/command.h

src/console.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/dehacked.c

src/dummy/i_cdmus.c

src/dummy/i_video.c

src/filesrch.c

src/g_demo.c

src/g_game.c

src/g_input.c

src/hardware/hw_main.c

src/http-mserv.c

src/lua_baselib.c

src/lua_hook.h