nashmuhandes eda969e37f Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_3dfloors.cpp # src/r_plane.cpp # src/r_segs.cpp		2016-04-27 23:30:44 +08:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-04-27 23:30:44 +08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00