Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage

This commit is contained in:
Sebastian Piwell
2016-03-17 17:52:22 -04:00
@@ -30,7 +30,6 @@
#include <openspace/util/time.h>
#include <ghoul/filesystem/cachemanager.h>
#include <modules/newhorizons/util/decoder.h>
#include <boost/algorithm/string.hpp>
#include <openspace/util/spicemanager.h>
#include <fstream>