Alexander Bock 67f0fb3c08 Merge branch 'develop' into solarsystem2 ...

Conflicts:
	.gitignore
	include/openspace/util/spicemanager.h
	shaders/star_fs.glsl
	src/engine/openspaceengine.cpp
	src/rendering/renderengine.cpp
	src/rendering/stars/renderablestars.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp

2014-10-06 22:22:30 +02:00

6.5 KiB

Raw Blame History

View Raw