Rachael Alexanderson a78b713f4b Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/v_video.cpp		2016-12-06 18:19:08 -05:00
..
static	Merge https://github.com/coelckers/gzdoom	2016-12-06 18:19:08 -05:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00