Christoph Oelckers b1e8a3c21a Merge branch 'master' into portals ... # Conflicts: # src/actor.h # src/gl/scene/gl_portal.h # src/gl/scene/gl_sky.cpp # src/gl/scene/gl_wall.h # src/gl/scene/gl_walls.cpp # src/p_local.h # src/p_map.cpp # src/p_spec.cpp # src/r_data/r_interpolate.cpp # wadsrc/static/xlat/eternity.txt (note: this has not been tested. It may not compile!)		2016-02-14 12:29:59 +01:00
..
static	Merge branch 'master' into portals	2016-02-14 12:29:59 +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