Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into spr2-freeslots

CMakeLists.txt

comptime.bat

comptime.sh

src/comptime.c

src/config.h.in

src/console.c

src/d_clisrv.c

src/d_main.c

src/d_netcmd.c

src/d_player.h

src/dehacked.c

src/doomdef.h

src/doomtype.h

src/f_wipe.c

src/g_game.c

src/hardware/hw_defs.h

src/hardware/hw_glob.h

src/hardware/hw_main.c

src/hardware/hw_md2.c

src/info.c