Rachael Alexanderson 05662e5c4d Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_bsp.cpp # src/r_plane.cpp # src/r_things.cpp		2017-01-09 09:51:06 -05:00
..
strife_sbar.cpp	Merge https://github.com/coelckers/gzdoom	2017-01-09 09:51:06 -05:00