Christoph Oelckers 198fbf9297 Merge branch 'master' into whaven ... # Conflicts: # source/core/screenjob.cpp # source/core/searchpaths.cpp		2021-06-03 08:52:19 +02:00
..
src	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
all.cpp	Merge branch 'scriptable_cutscenes' into newrenderer	2021-05-02 22:37:46 +02:00