mirror of
https://github.com/Next-Flip/Momentum-Firmware.git
synced 2026-05-13 09:48:35 -07:00
Merge remote-tracking branch 'ofw/dev' into mntm-dev
This commit is contained in:
@@ -1,14 +1,13 @@
|
||||
#include <projdefs.h>
|
||||
#include <stdint.h>
|
||||
#include <furi.h>
|
||||
|
||||
#include <gui/elements.h>
|
||||
#include <gui/icon.h>
|
||||
#include <gui/view.h>
|
||||
|
||||
#include <assets_icons.h>
|
||||
#include <locale/locale.h>
|
||||
#include <momentum/momentum.h>
|
||||
|
||||
#include <desktop/desktop_settings.h>
|
||||
#include "../desktop_i.h"
|
||||
#include "desktop_view_locked.h"
|
||||
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
|
||||
#include <furi.h>
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <projdefs.h>
|
||||
#include <input/input.h>
|
||||
|
||||
#include <gui/canvas.h>
|
||||
#include <gui/view.h>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user