Arin Alexander 0bfd8d03bc Merge branch 'develop' into feature/Interface_lang ... # Conflicts: # limereport/lrreportengine.cpp # limereport/lrreportengine.h # limereport/lrreportengine_p.h		2018-05-15 22:17:56 +03: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	New functionality has been added to the report's variables	2017-09-26 00:19:59 +03:00
lrglobal.cpp	isDarkColor function has been added	2018-04-04 00:20:14 +03:00
lrglobal.h	QQmlEngine -> QJSEngine	2018-05-08 10:53:27 +03:00
lrpreviewreportwidget.h	ReportEnginePrivate has been changed to ReportEngine in PrewiewWindow and DesignerWindow	2017-03-22 14:42:09 +03:00
lrrenderengine.h	plugin extracted	2017-11-24 00:13:47 +03:00
lrreportdesignwindowintrerface.h	windows build fixed	2017-11-30 21:23:11 +03:00
lrreportengine.h	Language settings has been added to designer	2018-05-15 22:14:17 +03:00
lrscriptenginemanagerintf.h	QJSEngine has been added	2016-11-01 20:42:45 +03:00
LRScriptManager	1.1.1	2016-02-17 10:18:19 +03:00