Christoph Oelckers 7ba152e588 Merge branch 'master' into whaven ... # Conflicts: # source/core/gameinput.h # source/core/version.h # source/games/exhumed/src/enginesubs.cpp # source/games/sw/src/game.cpp		2021-11-12 11:19:23 +01:00
..
compatibility	- workaround to allow playing SW's Last Warrior mod in one go.	2021-07-26 00:58:00 +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-11-12 11:19:23 +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