Rachael Alexanderson 555d1100df Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/textures/hires/hqresize.cpp # wadsrc/static/language.enu # wadsrc/static/menudef.txt # wadsrc/static/zscript/menu/optionmenu.txt		2018-10-04 22:20:05 -04:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2018-10-04 22:20:05 -04:00
CMakeLists.txt	- qzdoom again so build scripts don't get confused.	2017-08-09 18:07:44 -04:00