gzdoom-gles/wadsrc
Christoph Oelckers b60069bb26 Merge branch 'master' of https://github.com/rheit/zdoom
# Conflicts:
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	wadsrc/static/xlat/eternity.txt
2016-02-14 18:20:56 +01:00
..
static Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-14 18:20:56 +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