Rachael Alexanderson deb62ee156 Merge commit 'refs/pull/340/head' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/gl/scene/gl_sprite.cpp # src/polyrenderer/scene/poly_sprite.cpp # src/swrenderer/things/r_sprite.cpp # wadsrc/static/language.enu # wadsrc/static/menudef.txt		2017-06-03 20:06:28 -04:00
..
static	Merge commit 'refs/pull/340/head' of https://github.com/coelckers/gzdoom	2017-06-03 20:06:28 -04:00
CMakeLists.txt	- QZDoom-ify	2017-03-24 14:59:25 -04:00