Christoph Oelckers 7c8d48bbfc Merge branch 'edf-gl' ... Conflicts: src/actor.h src/p_spec.cpp		2016-01-12 00:02:17 +01:00
..
static	Merge branch 'edf-gl'	2016-01-12 00:02:17 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2013-07-02 09:59:59 +02:00
wadsrc.vcproj	- converted project to Visual Studio 2008 format.	2013-10-03 12:08:57 +02:00