Christoph Oelckers d2309af3d5 Merge remote-tracking branch 'remotes/origin/master' into modern ... # Conflicts: # src/d_main.cpp # src/hwrenderer/scene/hw_weapon.cpp		2018-06-19 19:40:52 +02:00
..
gl_models.cpp	Merge remote-tracking branch 'remotes/origin/master' into modern	2018-06-19 19:40:52 +02:00
gl_models.h	Pass ticFrac to the model renderer as a parameter	2018-06-19 09:18:27 +02:00