Rachael Alexanderson 2b8db72cef Merge commit '2234d36c7a' ... # Conflicts: # src/r_main.cpp # src/r_plane.cpp # src/r_things.cpp		2017-02-15 05:42:57 -05:00
..
static	Merge commit '2234d36c7a'	2017-02-15 05:42:57 -05:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00