nashmuhandes e5e7e85b81 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/CMakeLists.txt # src/basicinlines.h # src/m_fixed.h # src/r_3dfloors.h # src/r_bsp.cpp # src/r_bsp.h # src/r_draw.cpp # src/r_draw.h # src/r_main.cpp # src/r_main.h # src/r_plane.h # src/r_segs.h # src/r_swrenderer.cpp # src/r_things.cpp # src/r_things.h # src/win32/fb_d3d9.cpp # src/win32/fb_ddraw.cpp # wadsrc_lights/static/doomdefs.txt # wadsrc_lights/static/hticdefs.txt		2016-12-23 00:51:30 +08:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-12-23 00:51:30 +08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00