Merge remote-tracking branch 'origin/4.2' into 4.3

Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
This commit is contained in:
Orgad Shaneh
2017-03-14 16:20:14 +02:00
57 changed files with 67 additions and 4 deletions

View File

@@ -37,6 +37,7 @@
#include <QDebug>
#include <QFile>
#include <QMessageBox>
#include <QRegExp>
#include <QStack>
#include <functional>