michal 845469b15d Merge branch 'develop' into solarsystem2 ...

Conflicts:
	openspace.cfg
	shaders/generated/constants.hglsl
	src/engine/openspaceengine.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderablepath.cpp
	src/rendering/renderabletrail.cpp
	src/util/spicemanager.cpp

2014-11-26 13:42:36 -05:00

518 B

Raw Blame History

View Raw