Jonas Strandstedt 82ff7fa984 Merge branch 'develop' into stars ...

Conflicts:
	include/openspace/util/constants.h
	shaders/pscstandard_fs.glsl
	shaders/pscstandard_vs.glsl
	src/interaction/interactionhandler.cpp
	src/main.cpp
	src/rendering/renderengine.cpp
	src/scenegraph/scenegraph.cpp
	src/scenegraph/scenegraphnode.cpp
	src/util/factorymanager.cpp

2014-09-24 15:39:22 +02:00

6.2 KiB

Raw Blame History

View Raw