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

2026-01-10 05:32:18 -06:00 · 2016-06-24 10:56:57 +02:00
parent 9705c33c16 b32262390c
commit 74ff3eddbd
3 changed files with 3 additions and 3 deletions
--- a/modules/onscreengui/src/guiperformancecomponent.cpp
+++ b/modules/onscreengui/src/guiperformancecomponent.cpp
@@ -32,7 +32,7 @@
 #include <ghoul/misc/sharedmemory.h>

 #include <imgui.h>
-#include <cppformat/format.h>
+#include <fmt/format.h>

 #include <algorithm>
 #include <numeric>
--- a/src/util/spicemanager.cpp
+++ b/src/util/spicemanager.cpp
@@ -32,7 +32,7 @@
 #include <glm/gtc/type_ptr.hpp>

 #include <algorithm>
-#include <cppformat/format.h>
+#include <fmt/format.h>

 namespace {
    const std::string _loggerCat = "SpiceManager";
--- a/src/util/time_lua.inl
+++ b/src/util/time_lua.inl
@@ -24,7 +24,7 @@

 #include <ghoul/misc/assert.h>

-#include <cppformat/format.h>
+#include <fmt/format.h>
 #include <ctime>

 namespace openspace {