Merge branch 'master' into newintro

src/b_bot.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/f_finale.c

src/f_finale.h

src/f_wipe.c

src/g_game.c

src/g_game.h

src/hardware/hw_drv.h

src/hardware/hw_light.c

src/hardware/hw_main.c

src/hardware/hw_main.h

src/hardware/r_opengl/r_opengl.c

src/info.c

src/info.h

src/m_menu.c