Arin Alexander b55582fad2 Merge branch 'master' into 1.4 ... # Conflicts: # limereport/lrreportengine.cpp # limereport/lrreportengine_p.h		2016-06-25 00:33:44 +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	ReportSetting has been added	2016-06-24 23:19:34 +03:00
lrpreviewreportwidget.h	page scale refactored	2016-04-06 00:06:11 +04:00
lrreportengine.h	Version 1.4 initial commit	2016-06-10 19:05:18 +04:00
lrscriptenginemanagerintf.h	<QScriptEngine> --> <QtScript/QScriptEngine>	2016-05-27 00:07:27 +04:00
LRScriptManager	1.1.1	2016-02-17 10:18:19 +03:00