Christoph Oelckers 0678a469de Merge remote-tracking branch 'remotes/zdoom/master' ... # Conflicts: # src/win32/i_system.cpp # tools/re2c/re2c.vcproj		2016-02-08 21:47:19 +01:00
..
static	Merge remote-tracking branch 'remotes/zdoom/master'	2016-02-08 21:47:19 +01:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-02-06 05:21:48 +01:00
wadsrc.vcproj	- converted project to Visual Studio 2008 format.	2013-10-03 12:08:57 +02:00