Merged master.

This commit is contained in:
Jonathas Costa
2018-04-20 21:37:40 -04:00
61 changed files with 3841 additions and 1592 deletions
@@ -27,7 +27,6 @@
#include <modules/spacecraftinstruments/util/imagesequencer.h>
#include <openspace/engine/openspaceengine.h>
#include <openspace/engine/configurationmanager.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/scene/scenegraphnode.h>
#include <openspace/scene/scene.h>