Christoph Oelckers 7fa690082e - fixed cherry picked commit. ... # Conflicts: # source/core/gamecontrol.h		2021-06-02 20:52:47 +02:00
..
src	- fixed cherry picked commit.	2021-06-02 20:52:47 +02:00
all.cpp	Merge branch 'scriptable_cutscenes' into newrenderer	2021-05-02 22:37:46 +02:00