gzdoom/wadsrc
Magnus Norddahl f6bede8374 Merge remote-tracking branch 'gzdoom_upstream/master' into lightmath
# Conflicts:
#	src/gl/renderer/gl_renderbuffers.cpp
#	src/gl/renderer/gl_renderbuffers.h
#	src/gl/renderer/gl_renderer.h
#	src/gl/scene/gl_scene.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.z
2016-09-09 09:31:30 +02:00
..
static Merge remote-tracking branch 'gzdoom_upstream/master' into lightmath 2016-09-09 09:31:30 +02:00
CMakeLists.txt Merge branch 'master' of https://github.com/rheit/zdoom 2016-02-06 05:21:48 +01:00