Christoph Oelckers 671d200aa7 Merge branch 'master' into whaven ... # Conflicts: # source/build/include/buildtypes.h # source/core/console/c_notifybuffer.cpp # source/core/d_protocol.h # source/core/version.h # wadsrc/static/zscript.txt		2021-05-16 13:03:17 +02:00
..
build.h	Merge branch 'master' into whaven	2021-05-16 13:03:17 +02:00
buildtypes.h	- fixed some very noisy warnings in two headers.	2021-05-12 21:47:32 +02:00
clip.h	- removed clipshape feature as it is a feature of modern EDuke32 maps only.	2020-07-14 15:36:25 +02:00
compat.h	Fix compilation on OpenBSD	2021-05-10 08:25:14 +02:00
mdsprite.h	- Cleanup of the voxel code.	2021-04-05 18:05:43 +02:00
polymost.h	Merge branch 'master' into newrenderer2	2021-04-11 14:38:56 +02:00
prlights.h	The great repository rearrangement of 2017.	2017-02-01 10:01:11 +00:00