Quentin Guidée d8464ba6a9 Fix conflicts

2020-02-29 12:45:54 +01:00

..

sub_menu

Merge branch 'add_name' of https://github.com/coco33920/Omega-1 into coco33920-add_name

2020-02-25 20:59:00 +01:00

app.cpp

Remove External app for unsupported devices (web/n0100) and adds a basic examination checking system

2020-01-19 23:45:35 +01:00

app.h

Fix conflicts

2020-02-17 17:10:32 +01:00

base.de.i18n

Fix conflicts

2020-02-29 12:36:33 +01:00

base.en.i18n

[Fix] Allow to compile only the code app

2020-02-29 10:57:29 +01:00

base.es.i18n

[Fix] Allow to compile only the code app

2020-02-29 10:57:29 +01:00

base.fr.i18n

[Fix] Allow to compile only the code app

2020-02-29 10:57:29 +01:00

base.hu.i18n

[Fix] Allow to compile only the code app

2020-02-29 10:57:29 +01:00

base.pt.i18n

[Fix] Allow to compile only the code app

2020-02-29 10:57:29 +01:00

cell_with_separator.cpp

[WIP] Fix settings

2020-02-16 12:42:08 +01:00

cell_with_separator.h

[apps/settings] Separation is always below the CellWithSeparator

2020-02-12 15:13:15 +01:00

main_controller_prompt_beta.cpp

Fix conflicts

2020-02-23 13:45:07 +01:00

main_controller_prompt_none.cpp

Fix conflicts

2020-02-23 13:45:07 +01:00

main_controller_prompt_update.cpp

Fix conflicts

2020-02-23 13:45:07 +01:00

main_controller.cpp

Add name into contributors page

2020-02-25 20:11:05 +01:00

main_controller.h

Add name into contributors page

2020-02-25 20:11:05 +01:00

Makefile

Fix conflicts

2020-02-23 13:27:10 +01:00

message_table_cell_with_editable_text_with_separator.h

[apps/settings] Separation is always below the CellWithSeparator

2020-02-12 15:13:15 +01:00

message_table_cell_with_gauge_with_separator.h

[apps/settings] Separation is always below the CellWithSeparator

2020-02-12 15:13:15 +01:00

settings_icon.png

…