Merge branch 'develop' of github.com:OpenSpace/OpenSpace into develop

This commit is contained in:
Emil Axelsson
2016-10-07 20:43:06 +02:00
+2
View File
@@ -30,6 +30,8 @@
#include <ghoul/misc/assert.h>
#include <ghoul/opengl/ghoul_gl.h>
#include <thread>
#include <sgct.h>
sgct::Engine* _sgctEngine;