merge fix

--HG--
branch : develop
This commit is contained in:
Felix Ulber 2015-02-26 23:27:33 +01:00
parent f3eb68c2db
commit 139d4d26f0

View File

@ -29,6 +29,7 @@
#include "vabstracttool.h" #include "vabstracttool.h"
#include <QGraphicsView> #include <QGraphicsView>
#include <QIcon> #include <QIcon>
#include <QStyle>
#include <QMessageBox> #include <QMessageBox>
#include <QtCore/qmath.h> #include <QtCore/qmath.h>
#include "../../libs/vpropertyexplorer/checkablemessagebox.h" #include "../../libs/vpropertyexplorer/checkablemessagebox.h"