Rachael Alexanderson 5f9377ae2a Merge commit 'refs/pull/980/head' of https://github.com/coelckers/gzdoom ... # Conflicts: # wadsrc/static/menudef.txt		2020-08-25 11:32:10 -04:00
..
static	Merge commit 'refs/pull/980/head' of https://github.com/coelckers/gzdoom	2020-08-25 11:32:10 -04:00
CMakeLists.txt	- missed one qzdoom reference	2017-07-20 06:45:08 -04:00