Merge branch 'SaisieJolie30Apr' into SaisieJolie8May

Change-Id: Ia4196119fc56c5bc3423aea752b49f3f7ba39499
This commit is contained in:
Léa Saviot
2018-05-08 15:11:51 +02:00
234 changed files with 7421 additions and 1664 deletions

View File

@@ -279,7 +279,7 @@ bool ConsoleController::textFieldDidFinishEditing(TextField * textField, const c
return true;
}
bool ConsoleController::textFieldDidAbortEditing(TextField * textField, const char * text) {
bool ConsoleController::textFieldDidAbortEditing(TextField * textField) {
if (inputRunLoopActive()) {
askInputRunLoopTermination();
} else {