Merge branch 'next' into any-resolution

.gitattributes

.gitlab-ci.yml

cpdebug.mk

src/Android.mk

src/CMakeLists.txt

src/Makefile

src/Makefile.d/detect.mk

src/Makefile.d/features.mk

src/Makefile.d/win32.mk

src/Sourcefile

src/android/i_net.c

src/blua/liolib.c

src/command.c

src/d_clisrv.c

src/d_main.c

src/deh_soc.c

src/deh_soc.h

src/deh_tables.c

src/doomdef.h

src/doomstat.h