Christoph Oelckers 5784e45f41 Merge commit 'aa6bd8ffcc11c0ae3de1dae1ab530a999dd510c9' into whaven ... # Conflicts: # source/core/gameinput.h		2021-04-25 12:18:39 +02:00
..
build.h	Merge commit 'aa6bd8ffcc11c0ae3de1dae1ab530a999dd510c9' into whaven	2021-04-25 12:18:39 +02:00
buildtypes.h	Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven	2021-04-17 14:59:12 +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	- replaced 'static FORCE_INLINE' globally with 'inline'.	2021-03-24 21:43:36 +01:00
mdsprite.h	- Cleanup of the voxel code.	2021-04-05 18:05:43 +02:00
mmulti.h	- removed some dead variables.	2020-01-01 13:11:44 +01: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