Merge work and bugfixes

This commit is contained in:
Hans-Christian Helltegen
2014-04-14 11:40:53 -04:00
parent 909350faaa
commit b259c64655
10 changed files with 33 additions and 16 deletions
+2 -2
View File
@@ -25,13 +25,13 @@
#include <openspace/engine/openspaceengine.h>
// sgct header has to be included before all others due to Windows header
#include "sgct.h"
#include <sgct.h>
#include <openspace/interaction/deviceidentifier.h>
#include <openspace/interaction/interactionhandler.h>
#include <openspace/rendering/renderengine.h>
#include <openspace/util/time.h>
#include <openspace/util//spice.h>
#include <openspace/util/spice.h>
#include <openspace/util/factorymanager.h>