merge commit

--HG--
branch : develop
This commit is contained in:
MitSchoko 2014-10-23 21:23:18 +02:00
commit 13e7897d64

View file

@ -26,6 +26,7 @@
#include <QDebug> #include <QDebug>
#include "qmuparsererror.h" #include "qmuparsererror.h"
#include <QtCore/qmath.h> #include <QtCore/qmath.h>
#include <stdexcept>
using namespace std; using namespace std;