Christoph Oelckers 671d200aa7 Merge branch 'master' into whaven ... # Conflicts: # source/build/include/buildtypes.h # source/core/console/c_notifybuffer.cpp # source/core/d_protocol.h # source/core/version.h # wadsrc/static/zscript.txt		2021-05-16 13:03:17 +02:00
..
blood	- status bar interface work.	2021-05-15 10:25:38 +02:00
duke	- fixed all issues with Duke's/RR's status bar.	2021-05-15 16:46:08 +02:00
exhumed	- fixed GetChunkFrame implementation and one bad GetString call.	2021-05-15 10:25:38 +02:00
sw	- fixed SW status bar.	2021-05-16 10:25:56 +02:00
wh	Merge branch 'master' into whaven	2021-05-16 13:03:17 +02:00