Merge remote-tracking branch 'github/master' into Tree

This commit is contained in:
Émilie Feral
2018-09-13 17:03:31 +02:00
54 changed files with 492 additions and 238 deletions

View File

@@ -7,6 +7,9 @@
using namespace Poincare;
static inline int min(int x, int y) { return (x<y ? x : y); }
static inline int max(int x, int y) { return (x>y ? x : y); }
namespace Shared {
StoreController::ContentView::ContentView(DoublePairStore * store, Responder * parentResponder, TableViewDataSource * dataSource, SelectableTableViewDataSource * selectionDataSource, TextFieldDelegate * textFieldDelegate) :