nashmuhandes db920274f1 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # src/version.h		2017-02-20 10:20:29 +08:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom	2017-02-20 10:20:29 +08:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00