Rachael Alexanderson edb025faa0 Merge remote-tracking branch 'origin/re-qzdoom2' into master202008 ... # Conflicts: # src/win32/zdoom.rc		2020-08-03 11:24:52 -04:00
..
static	- fixed: the minotaur spawned its floor flames regardless of the setting of compat_minotaur	2020-07-28 12:25:35 +02:00
CMakeLists.txt	- re-qzdoom 2	2020-04-12 09:34:33 -04:00