Files
OpenSpace/include/openspace
Michal Marcinkowski 44e02465a1 Merge branch 'develop' into solarsystem2
Conflicts:
	include/openspace/util/powerscaledsphere.h
	src/rendering/renderablefov.cpp
	src/rendering/renderablesphericalgrid.cpp
	src/rendering/renderabletrail.cpp
	src/util/powerscaledsphere.cpp
	src/util/spicemanager.cpp
2015-01-22 10:31:40 -05:00
..
2014-12-18 17:21:20 +01:00
2015-01-21 15:12:54 +01:00
2014-12-16 21:54:53 +01:00
2014-11-26 12:12:03 -05:00