From 41ec729d165f718542a1dd85e0ccdc7216a3ef51 Mon Sep 17 00:00:00 2001
From: Eric Myers <EricMyers47@gmail.com>
Date: Mon, 12 Dec 2016 07:39:47 -0500
Subject: [PATCH 1/3] Update main.cpp

Added #include <thread> to main.cpp for Mac
---
 apps/OpenSpace/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp
index 49b47645a9..a84df70c2d 100644
--- a/apps/OpenSpace/main.cpp
+++ b/apps/OpenSpace/main.cpp
@@ -29,6 +29,7 @@
 #include <ghoul/logging/logmanager.h>
 #include <ghoul/misc/assert.h>
 #include <ghoul/opengl/ghoul_gl.h>
+#include <thread>
 
 #include <sgct.h>
 

From 15867d684922c0d011eee47be1923fe310747537 Mon Sep 17 00:00:00 2001
From: Alexander Bock <alexander.bock@liu.se>
Date: Mon, 13 Feb 2017 13:45:27 -0500
Subject: [PATCH 2/3] Cleanup of warnings in external libraries

---
 ext/ghoul                       | 2 +-
 ext/sgct                        | 2 +-
 modules/kameleon/CMakeLists.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/ghoul b/ext/ghoul
index 3ee30f00c1..6adcb40525 160000
--- a/ext/ghoul
+++ b/ext/ghoul
@@ -1 +1 @@
-Subproject commit 3ee30f00c198b65ce34ef9f2032831c6729ff35d
+Subproject commit 6adcb40525e5c052b63a7a764d12ea4da897c015
diff --git a/ext/sgct b/ext/sgct
index d47e9d6d1d..b3bf32e8bd 160000
--- a/ext/sgct
+++ b/ext/sgct
@@ -1 +1 @@
-Subproject commit d47e9d6d1d55a1730a6f3a8f58abee4a4a0b95de
+Subproject commit b3bf32e8bd59c7a79e899face441a26a361fe982
diff --git a/modules/kameleon/CMakeLists.txt b/modules/kameleon/CMakeLists.txt
index 22b1e2c13b..2171629667 100644
--- a/modules/kameleon/CMakeLists.txt
+++ b/modules/kameleon/CMakeLists.txt
@@ -63,7 +63,7 @@ create_new_module(
     endif ()
     set_property(TARGET ccmc PROPERTY FOLDER "External")
     if (TARGET cdf)
-        if (OPENSPACE_DISABLE_EXTERNAL_WARNINGS)
+        if (GHOUL_DISABLE_EXTERNAL_WARNINGS)
             if (MSVC)
                 target_compile_options(cdf PUBLIC "/W0" "/MP")
             else ()

From 48e77f6106979c9d2b602534e6bccebcbb1aadad Mon Sep 17 00:00:00 2001
From: noahdasanaike <dasanaike.noah@gmail.com>
Date: Mon, 13 Feb 2017 16:12:35 -0500
Subject: [PATCH 3/3] Modified launcher checkboxes to have clearly defined
 check-indicators; (#228)

green indicates a check, whereas red does not.
---
 apps/Launcher/main.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/Launcher/main.cpp b/apps/Launcher/main.cpp
index c802f468cc..ecc15ca4ea 100644
--- a/apps/Launcher/main.cpp
+++ b/apps/Launcher/main.cpp
@@ -82,14 +82,14 @@ QCheckBox::indicator {
 }
 QCheckBox::indicator::unchecked {
     border: 1px solid #5A5A5A;
-    background: transparent;
+    background: #a10000;
 }
 QCheckBox::indicator:unchecked:hover {
     border: 1px solid #DDDDDD;
 }
 QCheckBox::indicator::checked {
-    border: 1px solid #AAAAAA;
-    background: #666666;
+    border: 1px solid #5A5A5A;
+    background: #8dc73f;
 }
 QCheckBox::indicator:checked:hover {
     border: 1px solid #DDDDDD;