Anton Arbring d3bf8eb7f7 Merge branch 'timeadjustments' into NewHorizonsMerge ...

Conflicts:
	CMakeLists.txt
	include/openspace/rendering/model/modelgeometry.h
	include/openspace/rendering/model/wavefrontgeometry.h
	include/openspace/rendering/planets/renderableplanetprojection.h
	include/openspace/util/imagesequencer.h
	scripts/default_startup.lua
	src/abuffer/abuffer.cpp
	src/rendering/model/renderablemodel.cpp
	src/rendering/model/wavefrontgeometry.cpp
	src/rendering/planets/renderableplanet.cpp
	src/rendering/planets/renderableplanetprojection.cpp
	src/rendering/renderablefov.cpp
	src/rendering/renderabletrail.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/spiceephemeris.cpp
	src/util/imagesequencer.cpp

2015-04-23 22:51:55 -04:00

..

bind_keys.lua

updates to the imagesequencing & renderableplanet projection classes mainly

2015-03-24 12:31:03 -04:00

default_settings.lua

Fixed crash with changing coordinate systems

2015-02-26 18:07:37 +01:00

default_startup.lua

Merge branch 'timeadjustments' into NewHorizonsMerge

2015-04-23 22:51:55 -04:00