nashmuhandes 032ad95b0f Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # docs/licenses/README.TXT # src/gl/dynlights/gl_dynlight.cpp # src/r_bsp.cpp # src/r_draw.cpp # src/r_plane.h # src/r_things.cpp # src/r_things.h # src/win32/fb_d3d9.cpp # src/win32/win32video.cpp # src/win32/zdoom.rc		2017-02-05 20:13:39 +08:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2017-02-05 20:13:39 +08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00