Christoph Oelckers 2f325a1b81 Merge branch 'maint' into maint_1.8 ... Conflicts: src/version.h		2013-07-03 07:34:25 +02:00
..
static	Merge branch 'maint' into maint_1.8	2013-07-03 07:34:25 +02:00
CMakeLists.txt	Merge branch 'maint' into maint_1.8	2013-07-02 10:04:35 +02:00
wadsrc.vcproj	- GZDoom differences to /wadsrc.	2013-06-23 09:30:04 +02:00