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
..
buildtiles.cpp	- fixed the remaining warnings.	2021-05-12 21:50:01 +02:00
buildtiles.h	Merge branch 'master' into whaven	2021-06-03 08:52:19 +02:00
hightile.cpp	- fixed hires replacements for colorized font characters.	2021-06-01 11:29:39 +02:00
skytexture.cpp	- fix sky palette in Polymost mode.	2021-04-22 22:03:16 +02:00