Christoph Oelckers b8fd41a58f Merge master into whaven ... # Conflicts: # source/core/gamecontrol.h		2021-03-15 10:42:59 +01: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 master into whaven	2021-03-15 10:42:59 +01: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