Merge remote-tracking branch 'origin/master'

2024-10-05 22:48:35 +08:00
parent 03995d6f10 0107ca44d7
commit 05763a0b79
38 changed files with 422 additions and 164 deletions
--- a/src/system_tray.cpp
+++ b/src/system_tray.cpp
@@ -36,7 +36,7 @@
  // lib includes
  #include "tray/src/tray.h"
  #include <boost/filesystem.hpp>
-  #include <boost/process/environment.hpp>
+  #include <boost/process/v1/environment.hpp>

  // local includes
  #include "config.h"