Merge branch 'dev' of https://github.com/flipperdevices/flipperzero-firmware into mntm-dev

2026-05-13 08:08:35 -07:00 · 2024-06-04 03:01:51 +01:00
parent 9b748ea792 03196fa110
commit 23da827361
132 changed files with 120 additions and 188 deletions
--- a/applications/services/rpc/rpc.c
+++ b/applications/services/rpc/rpc.c
@@ -1,4 +1,3 @@
-#include "profiles/serial_profile.h"
 #include "rpc_i.h"

 #include <pb.h>
--- a/applications/services/rpc/rpc_desktop.c
+++ b/applications/services/rpc/rpc_desktop.c
@@ -1,7 +1,6 @@
 #include "flipper.pb.h"
 #include "rpc_i.h"
 #include <desktop/desktop.h>
-#include "desktop.pb.h"

 #define TAG "RpcDesktop"