Merge remote-tracking branch 'origin/main' into feature/python-bindings

# Conflicts: # conanfile.py
valgur · Jan 10, 2025 · 91fcb1e · 91fcb1e
2 parents 90be529 + 40219c3
commit 91fcb1e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/conanfile.py b/conanfile.py
@@ -48,7 +48,7 @@ def requirements(self):
         self.requires("nlohmann_json/[>=3.11 <3.12]", transitive_headers=True)
         self.requires("spdlog/[>=1.13 <2]", transitive_headers=True, transitive_libs=True, force=True)
         self.requires("gegles-spdlog_setup/[>=1.1 <2]", transitive_headers=True)
-        # fmt/11.1.1 is currently not compatible with spdlog/1.15 https://github.com/gabime/spdlog/issues/3302
+        # fmt/11.1.1 is currently not compatible with spdlog https://github.com/gabime/spdlog/issues/3302
         self.requires("fmt/11.0.2", force=True)
 
     def build_requirements(self):