Merge branch 'next' into udmf-next

extras/conf/SRB2-22.cfg

src/am_map.c

src/d_clisrv.c

src/d_clisrv.h

src/d_main.c

src/d_net.c

src/d_netcmd.c

src/d_player.h

src/dehacked.c

src/djgppdos/i_system.c

src/doomdata.h

src/doomdef.h

src/doomstat.h

src/f_finale.c

src/f_finale.h

src/f_wipe.c

src/g_demo.c

src/g_game.c

src/g_game.h

src/g_state.h