Files
OpenSpace/modules/space/rendering/renderableplanet.cpp
Emil Axelsson a71f4974fe Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/planetradius
Conflicts:
	modules/space/rendering/simplespheregeometry.h
2017-04-13 21:31:40 +02:00

23 KiB