Quentin 487efb1fe6 Solve conflicts

2019-11-01 22:02:07 +01:00

..

about_controller.cpp

Merge branch 'master' into lavaos

2019-10-27 11:44:35 +01:00

about_controller.h

Add: LavaOS version in 'about' settings

2019-08-10 11:15:58 +02:00

accessibility_controller.cpp

[apps] Implement accessibility features

2019-11-01 20:00:33 +01:00

accessibility_controller.h

[apps] Implement accessibility features

2019-11-01 20:00:33 +01:00

contributors_controller.cpp

Add makefile and contributors_controller files

2019-08-22 19:26:05 -04:00

contributors_controller.h

[1.12.3] New contributor

2019-11-01 21:45:06 +01:00

display_mode_controller.cpp

[apps/settings] Minimal number of significant digits in Engineering

2019-09-04 15:20:51 +02:00

display_mode_controller.h

[escher] TextField: all text fields use the same draft text buffer

2019-08-13 09:44:00 +02:00

exam_mode_controller.cpp

[apps] Substitute "app()->container()" by "AppsContainer::sharedAppsContainer()"

2019-07-19 15:06:25 +02:00

exam_mode_controller.h

[settings] Split SubController in several controllers: about_controller,

2018-09-25 15:13:31 +02:00

generic_sub_controller.cpp

[coding style] Make some methods const

2019-09-09 20:05:14 +02:00

generic_sub_controller.h

[apps] Implement accessibility features

2019-11-01 20:00:33 +01:00

language_controller.cpp

[settings] Split SubController in several controllers: about_controller,

2018-09-25 15:13:31 +02:00

language_controller.h

[settings] Split SubController in several controllers: about_controller,

2018-09-25 15:13:31 +02:00

message_table_cell_with_editable_text_with_separator.cpp

[escher] TextField: all text fields use the same draft text buffer

2019-08-13 09:44:00 +02:00

message_table_cell_with_editable_text_with_separator.h

[apps/escher] Uniformize k_separatorThickness

2019-09-09 19:10:17 +02:00

preferences_controller.cpp

Merge branch 'master' into lavaos

2019-10-27 11:44:35 +01:00

preferences_controller.h

Add LED color refrences to preferences_controller.

2019-08-22 14:40:00 -04:00