Merge branch 'main' into 2027

2026-06-28 02:11:43 +00:00 · 2025-05-29 21:41:50 -07:00
parent 25eacfa226 ca05ffa1b9
commit 6c16e846fa
347 changed files with 18562 additions and 11557 deletions
--- a/datalogtool/src/main/native/cpp/App.cpp
+++ b/datalogtool/src/main/native/cpp/App.cpp
@@ -10,11 +10,9 @@
 #include <glass/Context.h>
 #include <glass/MainMenuBar.h>
 #include <glass/Storage.h>
-#include <libssh/libssh.h>
-
-#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>
 #include <imgui_internal.h>
+#include <libssh/libssh.h>
 #include <wpigui.h>
 #include <wpigui_openurl.h>

--- a/datalogtool/src/main/native/cpp/App.h
+++ b/datalogtool/src/main/native/cpp/App.h
@@ -4,7 +4,6 @@

 #pragma once

-#define IMGUI_DEFINE_MATH_OPERATORS
 #include <imgui.h>

 void SetNextWindowPos(const ImVec2& pos, ImGuiCond cond = 0,