gzdoom-gles/wadsrc
Magnus Norddahl aa199a91c5 Merge remote-tracking branch 'origin/capsky' into qzdoom
# Conflicts:
#	src/r_plane.cpp
#	src/r_sky.cpp
#	wadsrc/static/language.enu
#	wadsrc/static/menudef.txt
2016-10-20 01:05:05 +02:00
..
static Merge remote-tracking branch 'origin/capsky' into qzdoom 2016-10-20 01:05:05 +02:00
CMakeLists.txt Establish QZDoom 2016-09-14 02:21:35 -04:00