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
..
blood	- fixed compilation (again.)	2021-06-02 21:00:39 +02:00
duke	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
exhumed	- Exhumed: precache all frames of tile animations.	2021-06-02 21:31:38 +02:00
sw	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
whaven	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00