Rachael Alexanderson 978152f483 Merge https://github.com/rheit/zdoom ... # Conflicts: # wadsrc/static/compatibility.txt		2016-12-19 08:16:41 -05:00
..
static	Merge https://github.com/rheit/zdoom	2016-12-19 08:16:41 -05:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00