mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-24 13:09:22 -06:00
Code Issues Packages Projects Releases Wiki Activity
Files
a7da4d84cc33f23b6238cb22094d56576c6ca80c
OpenSpace/include/openspace/rendering/renderable.h
Jonas Strandstedt 5427dbdeb2 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 
Conflicts:
	src/rendering/planets/renderableplanet.cpp
	src/rendering/renderablefieldlines.cpp
	src/rendering/renderablevolumegl.cpp
	src/rendering/stars/renderablestars.cpp
2014-09-26 17:17:18 +02:00

3.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink