Rachael Alexanderson 0f1b39f138 Merge ../qzdoom ... # Conflicts: # CMakeLists.txt # src/CMakeLists.txt # src/posix/sdl/hardware.cpp # src/r_3dfloors.cpp # src/r_3dfloors.h # src/r_bsp.cpp # src/r_bsp.h # src/r_draw.cpp # src/r_draw.h # src/r_local.h # src/r_main.cpp # src/r_main.h # src/r_plane.cpp # src/r_plane.h # src/r_segs.cpp # src/r_segs.h # src/r_swrenderer.cpp # src/r_swrenderer.h # src/r_things.cpp # src/r_things.h # src/win32/fb_d3d9.cpp # src/win32/hardware.cpp # src/win32/zdoom.rc		2017-03-06 22:25:22 -05:00
..
static	Merge ../qzdoom	2017-03-06 22:25:22 -05:00
CMakeLists.txt	Establish QZDoom	2016-09-14 02:21:35 -04:00