Quentin Guidée 17432be1d8 Fixed conflicts

2019-12-11 14:27:31 +01:00

..

app.cpp

Merge branch 'master' into f7

2019-08-06 17:40:14 +02:00

app.h

[apps/on_boarding] Move LanguageController::reinitOnBoarding() to App

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

base.de.i18n

Fixed german special characters

2019-06-06 10:00:32 +02:00

base.en.i18n

[on-boarding] Improve beta pop-up layout

2018-10-16 11:09:50 +02:00

base.es.i18n

[unicode] Fix Spanish literals

2019-05-03 15:53:19 +02:00

base.fr.i18n

[unicode] Add accents in french litterals

2019-05-03 15:53:19 +02:00

base.pt.i18n

[unicode] Fix portuguese literals

2019-05-03 15:53:20 +02:00

language_controller.cpp

[scripts] Remove EPSILON_BOOT_PROMPT flag

2019-08-08 17:21:53 +02:00

language_controller.h

[apps/on_boarding] LanguageController does not need to hold LogoController

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

logo_controller.cpp

[apps/on_boarding] Fix LED clash between on boarding and exam mode

2019-12-11 13:51:38 +01:00

logo_controller.h

[apps/on_boarding] Reset LED only if POST was performed

2019-04-30 15:40:47 +02:00

logo_icon.png

[apps/on_boarding] Changed the logo to omega's one.

2019-11-11 08:32:12 +01:00

logo_view.cpp

New dark theme & KDColorWhite -> Palette::BackgroundHard

2019-11-26 23:04:03 +01:00

logo_view.h

[on_boarding]

2017-05-12 10:42:34 +02:00

Makefile

Makefiles: avoid building all sources for each target; introduce more

2019-08-08 17:22:01 +02:00

pop_up_controller.cpp

[scripts] Remove EPSILON_BOOT_PROMPT flag

2019-08-08 17:21:53 +02:00

pop_up_controller.h

[scripts] Remove EPSILON_BOOT_PROMPT flag

2019-08-08 17:21:53 +02:00

power_on_self_test.cpp

[apps/on_boarding] If POST are OK, the led is white

2019-12-06 11:49:16 +01:00

power_on_self_test.h

[apps/bench] Change LCD Data pattern (tiling red/blue/green)

2019-07-12 17:50:38 +02:00