mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-02 01:30:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
c7809cb6cf941aec22b520ec27ad69e57e6015a4
OpenSpace/modules/base/rendering/renderabletrail.cpp
Alexander Bock ae6ade497b Merge branch 'feature/render-bins' into feature/rosetta 
Conflicts:
	data/scene/earth/earth.mod
	include/openspace/util/updatestructures.h
	modules/base/shaders/ephemeris_fs.glsl
	modules/base/shaders/plane_fs.glsl
2016-08-29 15:53:59 +02:00

14 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink