Alexander Bock b9a2cbff01 Merge branch 'master' into feature/exoplanets ...

# Conflicts:
#	include/openspace/engine/openspaceengine.h
#	src/scene/sceneinitializer.cpp

2019-01-23 17:00:57 +01:00

..

gaia

Feature/gaia mission merge (#766)

2018-11-20 18:19:08 -05:00

volume

Feature/volume tools (#614)

2018-06-08 09:47:24 -04:00

csvtobin.task

Modified path.

2018-05-09 13:43:27 -04:00

default.task

Feature/thesis work merge (#566)

2018-03-20 09:30:59 +01:00

full_sync.task

Move VRT specification into separate customization asset

2017-12-31 22:13:55 -05:00