Magnus Norddahl 1c3440e391 Merge remote-tracking branch 'gzdoom/master' into qzdoom ... # Conflicts: # src/r_plane.cpp # src/r_plane.h		2017-01-16 06:03:21 +01:00
..
drawers
line	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-16 06:03:21 +01:00
plane	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-16 06:03:21 +01:00
scene	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-16 06:03:21 +01:00
segments
things
r_memory.cpp
r_memory.h
r_swrenderer.cpp
r_swrenderer.h