Merge branch 'master' into plane-displacement

SRB2.cbp

debian/docs

src/Makefile

src/d_clisrv.c

src/d_clisrv.h

src/d_net.c

src/d_net.h

src/d_netcmd.c

src/d_netcmd.h

src/d_netfil.c

src/d_netfil.h

src/d_player.h

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/g_game.c

src/hardware/hw_light.c

src/hardware/hw_main.c

src/hu_stuff.c

src/info.c