MX a7691b2d3b Fix merge issues

2023-05-11 17:57:17 +03:00

..

desktop_scene_config.h

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00

desktop_scene_debug.c

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00

desktop_scene_fault.c

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00

desktop_scene_hw_mismatch.c

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00

desktop_scene_i.h

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00

desktop_scene_lock_menu.c

Rpc: add desktop service. Desktop: refactor locking routine. (#2665)

2023-05-11 19:50:17 +10:00

desktop_scene_locked.c

Rpc: add desktop service. Desktop: refactor locking routine. (#2665)

2023-05-11 19:50:17 +10:00

desktop_scene_main.c

Fix merge issues

2023-05-11 17:57:17 +03:00

desktop_scene_pin_input.c

Rpc: add desktop service. Desktop: refactor locking routine. (#2665)

2023-05-11 19:50:17 +10:00

desktop_scene_pin_timeout.c

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00

desktop_scene_slideshow.c

[FL-2844] desktop: removing slideshow file when leaving slideshow view (#1762)

2022-09-21 23:42:59 +09:00

desktop_scene.c

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00

desktop_scene.h

[FL-2627] Flipper applications: SDK, build and debug system (#1387)

2022-09-15 02:21:03 +09:00