nashmuhandes 9472f09b7a Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_main.cpp		2016-09-11 13:14:10 +08:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-09-11 13:14:10 +08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00