Christoph Oelckers e180d9afd3 Merge commit '40a533402e443a0de1673543642c892ab9c731fd' into powerslave ... # Conflicts: # source/audiolib/include/fx_man.h # source/audiolib/include/multivoc.h # source/audiolib/src/_multivc.h # source/audiolib/src/fx_man.cpp # source/audiolib/src/multivoc.cpp		2019-12-25 19:24:55 +01:00
..
static	Merge commit '40a533402e443a0de1673543642c892ab9c731fd' into powerslave	2019-12-25 19:24:55 +01:00
CMakeLists.txt	- added an engine resource file.	2019-10-04 23:29:00 +02:00