Christoph Oelckers 6f19c415d6 Merge commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven ... # Conflicts: # source/core/gamecontrol.h # source/core/searchpaths.cpp # wadsrc/static/zscript.txt # wadsrc/static/zscript/razebase.zs		2021-05-03 18:53:54 +02:00
..
compatibility	- added render workaround for CP07.	2021-05-03 17:48:35 +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 commit '6589222da6e2ac09d90681dbc6f97154cd60ef0b' into whaven	2021-05-03 18:53:54 +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