Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs

debian-template/rules

extras/conf/SRB2-22.cfg

extras/conf/udb/Includes/SRB222_linedefs.cfg

src/Makefile.d/versions.mk

src/Makefile.d/win32.mk

src/console.c

src/console.h

src/d_clisrv.c

src/d_clisrv.h

src/d_main.c

src/d_net.c

src/d_netcmd.c

src/d_netcmd.h

src/d_netfil.c

src/d_netfil.h

src/deh_tables.c

src/doomdef.h

src/f_finale.c

src/filesrch.c

src/filesrch.h