Willy-JL 33896ef98f Fix vscode's fumbled merge conflicts

2024-07-15 23:08:42 +01:00

..

desktop_events.h

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

2024-04-25 22:20:39 +01:00

desktop_view_debug.h

Api Symbols: replace asserts with checks (#3507)

2024-03-19 23:43:52 +09:00

desktop_view_lock_menu.c

cleanup of various warnings from clangd (#3682)

2024-06-03 14:43:23 +01:00

desktop_view_lock_menu.h

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

2024-03-20 04:18:26 +00:00

desktop_view_locked.c

Fix vscode's fumbled merge conflicts

2024-07-15 23:08:42 +01:00

desktop_view_locked.h

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

2024-03-20 04:18:26 +00:00

desktop_view_main.c

Merge fixes

2024-06-04 03:24:04 +01:00

desktop_view_main.h

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

2024-03-20 04:18:26 +00:00

desktop_view_pin_input.c

[FL-3867] Code formatting update (#3765)

2024-07-15 13:38:49 +09:00

desktop_view_pin_input.h

Show the wrong PIN Attempt count on the login screen (#3495)

2024-03-26 16:18:44 +09:00

desktop_view_pin_timeout.c

[FL-3832] Use static synchronisation primitives (#3679)

2024-06-05 18:04:03 +01:00

desktop_view_pin_timeout.h

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

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

desktop_view_slideshow.c

Merge remote-tracking branch 'ofw/dev' into mntm-dev

2024-07-15 22:18:35 +01:00

desktop_view_slideshow.h

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

2024-06-04 03:03:23 +01:00