Christopher Bruns 151b47c3ae Merge branch 'master' of https://github.com/coelckers/gzdoom into merge_down ... Conflicts: src/win32/i_system.cpp		2015-11-03 20:21:27 -05:00
..
static	Merge branch 'master' of https://github.com/coelckers/gzdoom into merge_down	2015-11-03 20:21:27 -05: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