Christoph Oelckers 9b8869e78d Merge branch 'master' into v2.x ... Conflicts: src/gl/textures/gl_material.cpp		2014-09-09 01:30:11 +02:00
..
static	Merge branch 'master' into v2.x	2014-09-09 01:30:11 +02: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