0
0
mirror of https://github.com/fralx/LimeReport.git synced 2025-09-23 16:39:07 +03:00

Merge branch 'develop' into feature/agg_functions_in_header

This commit is contained in:
Arin Alex
2017-04-05 01:09:20 +03:00
12 changed files with 215 additions and 165 deletions

View File

@@ -39,7 +39,6 @@
#include "serializators/lrxmlreader.h"
#include <memory>
#include <QMetaObject>
#include <QGraphicsSceneMouseEvent>
#include <QApplication>
@@ -1537,8 +1536,7 @@ BaseDesignIntf *Marker::object() const
return m_object;
}
}
} //namespace LimeReport