Quentin Guidée 5b2f33c80a Fix conflicts

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

..

domain_parameter_controller.cpp

Rename Shared::CartesianFunction to Shared::ContinuousFunction

2019-09-20 17:11:42 +02:00

domain_parameter_controller.h

[apps] Add screen telemetry identification

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

list_controller.cpp

Fixed some conflicts

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

list_controller.h

Rename Shared::CartesianFunction to Shared::ContinuousFunction

2019-09-20 17:11:42 +02:00

list_parameter_controller.cpp

[escher] Metric: change name TableCellLabelTopMargin to

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

list_parameter_controller.h

[apps/graph] Shorter messages and margins

2019-09-05 17:19:16 +02:00

text_field_function_title_cell.cpp

[escher/view] setFrame and layoutSubviews can be forced

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

text_field_function_title_cell.h

[escher/view] setFrame and layoutSubviews can be forced

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

text_field_with_max_length_and_extension.h

New Default theme: Omega theme! (Beta)

2019-11-29 19:42:39 +01:00

type_helper.cpp

[poincare/parser] Add context

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

type_helper.h

[apps/graph/list] Define PlotTypeHelper

2019-08-29 11:07:22 +02:00

type_parameter_controller.cpp

[apps] Don't forget to call viewWillAppear

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

type_parameter_controller.h

[apps] Add screen telemetry identification

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