Solve conflict in scripts/common.lua

2026-01-06 11:39:49 -06:00 · 2016-10-11 17:51:57 +02:00
parent b40f884781 e21b69cab8
commit c516dc5b25
152 changed files with 9806 additions and 3214 deletions
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -30,6 +30,8 @@
 #include <ghoul/misc/assert.h>
 #include <ghoul/opengl/ghoul_gl.h>

+#include <thread>
+
 #include <sgct.h>

 #include <chrono>