Arin Alexander 0a2d906a89 Merge branch 'master' into 1.4 ...

# Conflicts:
#	limereport/lrscriptenginemanager.h

2016-08-12 22:15:50 +04:00

..

LimeReport

1.1.1

2016-02-17 10:18:19 +03:00

lrcallbackdatasourceintf.h

Callback interface has been simplified

2016-03-27 10:40:13 +03:00

LRCallbackDS

1.1.1

2016-02-17 10:18:19 +03:00

LRDataManager

1.1.1

2016-02-17 10:18:19 +03:00

lrdatasourcemanagerintf.h

1.3.9

2016-02-17 10:39:17 +03:00

lrglobal.cpp

ReportSetting has been added

2016-06-24 23:19:34 +03:00

lrglobal.h

Show ToolBar action has been added to preview window

2016-08-08 15:50:04 +03:00

lrpreviewreportwidget.h

page scale refactored

2016-04-06 00:06:11 +04:00

lrreportengine.h

Merge branch 'master' into 1.4

2016-08-08 15:53:39 +03:00

lrscriptenginemanagerintf.h

ScriptEngineManager::addFunction has been fixed

2016-08-12 22:14:05 +04:00

LRScriptManager

1.1.1

2016-02-17 10:18:19 +03:00