Christoph Oelckers ef6fca823e Merge branch 'master' of https://github.com/rheit/zdoom ... Conflicts: src/version.h		2013-07-30 15:20:38 +02:00
..
static	Merge branch 'master' of https://github.com/rheit/zdoom	2013-07-30 15:20:38 +02:00
CMakeLists.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2013-07-02 09:59:59 +02:00
wadsrc.vcproj	- GZDoom differences to /wadsrc.	2013-06-23 09:30:04 +02:00