Quentin f37040dc8a [Fix] Conflicts

2020-04-16 14:04:56 +02:00

..

app_cell.cpp

Fixed some conflicts

2020-02-12 17:42:58 +01:00

app_cell.h

[escher/view] setFrame and layoutSubviews can be forced

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

app.cpp

[apps] Remove Container * parameter from all App constructors

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

app.h

[apps] Add screen telemetry identification

2020-02-17 10:31:24 -05:00

base.de.i18n

[Feature] Stay Home

2020-04-01 12:45:41 +02:00

base.en.i18n

[Feature] Stay Home

2020-04-01 12:45:41 +02:00

base.es.i18n

[Feature] Stay Home

2020-04-01 12:45:41 +02:00

base.fr.i18n

[Fix] Fix conflicts ._.

2020-04-07 14:53:19 +02:00

base.hu.i18n

[Feature] Stay Home

2020-04-01 12:45:41 +02:00

base.pt.i18n

[Feature] Stay Home

2020-04-01 12:45:41 +02:00

controller.cpp

[apps] Remove dead code

2020-02-17 10:31:24 -05:00

controller.h

[Fix] Conflicts

2020-04-16 14:04:56 +02:00

Makefile

[Fix] Fix conflicts ._.

2020-04-07 14:53:19 +02:00