Rachael Alexanderson 564bfe482c Merge branch 'zdoom-rgb666-take3' of https://github.com/raa-eruanna/qzdoom into qzdoom-rgb666 ... # Conflicts: # src/r_draw.cpp # src/r_plane.cpp # src/r_things.h # src/v_draw.cpp # src/v_video.cpp		2016-12-24 19:00:28 -05:00
..
static	Merge branch 'zdoom-rgb666-take3' of https://github.com/raa-eruanna/qzdoom into qzdoom-rgb666	2016-12-24 19:00:28 -05:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00