Major Cooke c15e20a69b Merge remote-tracking branch 'gzdoom/master' into newmaster ... # Conflicts: # .appveyor.yml # README.md # src/common/scripting/jit/jit_runtime.cpp # src/playsim/p_mobj.cpp		2020-04-12 08:16:28 -05:00
..
static	Merge remote-tracking branch 'gzdoom/master' into newmaster	2020-04-12 08:16:28 -05:00
CMakeLists.txt	- this is a fork, redo branding	2019-08-06 15:18:48 -04:00