mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-11-25 08:28:06 +03:00
Code Activity

Merge branch 'master' into 1.4

Browse Source 
# Conflicts:
#	limereport/limereport.pri
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander
2016-10-04 04:47:05 +04:00
parent e4457787f5 dc41959d52
commit d6eedd8cbd
17 changed files with 226 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
limereport/lrreportdesignwindow.h
View File

@@ -197,6 +197,7 @@ private:
QAction* m_newSubDetailFooter;
QAction* m_newGroupHeader;
QAction* m_newGroupFooter;
QAction* m_newTearOffBand;
QAction* m_aboutAction;
QAction* m_editLayoutMode;
QAction* m_addHLayout;