nashmuhandes aa5fbe9e0f Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_draw.cpp # src/r_local.h # src/r_main.cpp # src/r_plane.h # src/r_swrenderer.cpp # src/r_things.cpp # src/r_things.h # src/tables.cpp # src/tables.h		2016-04-30 15:35:32 +08:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-04-30 15:35:32 +08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00