arne krüger 85f4fcf7ae Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport ...

# Conflicts:
#	3rdparty/zint-2.4.4/backend_qt4/Zint.pro
#	demo_r1/demo_r1.pro
#	demo_r2/demo_r2.pro
#	designer/designer.pro
#	translations/limereport_ru.ts

2018-03-09 19:01:07 +01:00

..

demo_reports

Demo r2 added

2016-04-02 03:39:45 +03:00

images

Demo r2 added

2016-04-02 03:39:45 +03:00

demo_r2.pro

Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport

2018-03-09 19:01:07 +01:00

demo_r2.qrc

Demo r2 added

2016-04-02 03:39:45 +03:00

main.cpp

Demo r2 added

2016-04-02 03:39:45 +03:00

main.ico

Demo r2 added

2016-04-02 03:39:45 +03:00

mainicon.rc

Demo r2 added

2016-04-02 03:39:45 +03:00

mainwindow.cpp

Fix #56 isBusy has been added to ReportEngine

2016-12-13 12:47:55 +03:00

mainwindow.h

actionOneToOne fixed

2016-05-24 01:39:56 +04:00

mainwindow.ui

Demo R2 refactored

2016-05-24 01:32:21 +04:00