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
..
compatibility	- clear the sky flag off two more sectors in WT's "Skyline" map.	2021-05-10 20:13:29 +02:00
graphics	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
commonbinds.txt	Merge branch 'master' into witchaven2	2021-01-01 17:32:32 +11:00
defbinds.txt	- set up the Witchaven specific controls and their menu entries.	2020-10-31 14:07:43 +01:00
dsempty.lmp	- renamed the internal resource directory to "engine" and routed most literal mentions of the engine name through version.h	2019-12-26 14:04:53 +01:00
grpinfo.txt	Merge branch 'master' into whaven	2021-05-16 13:03:17 +02:00
leftbinds.txt	- set up the Witchaven specific controls and their menu entries.	2020-10-31 14:07:43 +01:00
origbinds.txt	- set up the Witchaven specific controls and their menu entries.	2020-10-31 14:07:43 +01:00