Quentin Guidée ab8f731515 Fixed some conflicts

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

..

list_controller.cpp

Fixed some conflicts

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

list_controller.h

[apps/*/expression_model_list_controller] Refactor modelStore()

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

list_parameter_controller.cpp

[escher] TableCell: the subviews are layoutted horizontally or

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

list_parameter_controller.h

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

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

sequence_toolbox.cpp

[poincare/parser] Add context

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

sequence_toolbox.h

[coding style] Make some methods const

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

type_parameter_controller.cpp

[escher] ExpressionTableCell is composed of a ScrollableExpressionView

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

type_parameter_controller.h

[coding style] Make some methods const

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