Merge branch 'master' into 1.4

# Conflicts:
#	limereport/lrreportrender.cpp
This commit is contained in:
Arin Alexander
2016-09-28 02:27:45 +04:00
5 changed files with 44 additions and 21 deletions

View File

@@ -109,7 +109,7 @@ private:
void renderGroupHeader(BandDesignIntf* parentBand, IDataSource* dataSource, bool firstTime);
void renderGroupFooter(BandDesignIntf* parentBand);
void initGroupFunctions();
void initGroups();
void extractGroupsFunction(BandDesignIntf* band);
void replaceGroupsFunction(BandDesignIntf* band);