Rachael Alexanderson c63ce8a6ec Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/gamedata/gi.cpp # src/gamedata/gi.h # wadsrc/static/mapinfo/chex.txt # wadsrc/static/mapinfo/doomcommon.txt # wadsrc/static/mapinfo/heretic.txt # wadsrc/static/mapinfo/hexen.txt # wadsrc/static/mapinfo/mindefaults.txt # wadsrc/static/mapinfo/strife.txt # wadsrc/static/zscript/base.zs		2019-08-05 21:09:21 -04:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2019-08-05 21:09:21 -04:00
CMakeLists.txt	- qzdoom again so build scripts don't get confused.	2017-08-09 18:07:44 -04:00