Merge branch 'master' into internal-hotplug-stableid

.gitattributes

libs/libpng-src/pngconf.h

libs/libpng-src/projects/libpng32.a

libs/libpng-src/projects/libpng64.a

srb2.png

src/d_clisrv.c

src/d_clisrv.h

src/d_main.c

src/d_netcmd.c

src/d_player.h

src/dehacked.c

src/doomdef.h

src/doomstat.h

src/f_finale.c

src/filesrch.c

src/g_game.c

src/g_game.h

src/hardware/hw_cache.c

src/hardware/hw_glide.h

src/hardware/hw_glob.h