Merge branch 'master' into change-colormap-ldef

bin/Mingw/Release/.gitignore

src/Makefile

src/b_bot.c

src/config.h.in

src/console.c

src/d_clisrv.c

src/d_clisrv.h

src/d_main.c

src/d_netcmd.c

src/d_player.h

src/dehacked.c

src/doomdata.h

src/doomdef.h

src/doomstat.h

src/f_finale.c

src/g_game.c

src/hardware/hw_light.c

src/hardware/hw_main.c

src/hu_stuff.c

src/hu_stuff.h