Magnus Norddahl 53a79ca215 Merge remote-tracking branch 'gzdoom/master' into qzdoom ... # Conflicts: # src/r_things.cpp		2017-01-18 04:09:16 +01:00
..
colormaps.cpp
colormaps.h	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-18 04:09:16 +01:00
r_interpolate.cpp	- split DObject::Destroy into the main method, a native OnDestroy and a scripted OnDestroy method and made the main method non-virtual	2017-01-12 22:49:18 +01:00
r_interpolate.h	- split DObject::Destroy into the main method, a native OnDestroy and a scripted OnDestroy method and made the main method non-virtual	2017-01-12 22:49:18 +01:00
r_translate.cpp
r_translate.h
renderstyle.cpp
renderstyle.h
sprites.cpp
sprites.h
voxels.cpp
voxels.h