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	Path to database has been fixed	2016-12-06 00:27:21 +03:00
images	Change to subforder project model.	2016-03-21 02:12:30 +01:00
demo_r1.pro	Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport	2018-03-09 19:01:07 +01:00
lr1.ico	Change to subforder project model.	2016-03-21 02:12:30 +01:00
lr6.ico	Change to subforder project model.	2016-03-21 02:12:30 +01:00
main.cpp	Change to subforder project model.	2016-03-21 02:12:30 +01:00
main.ico	Change to subforder project model.	2016-03-21 02:12:30 +01:00
mainicon.rc	Some limereport's project structure changes	2016-03-22 15:55:02 +03:00
mainwindow.cpp	Fix missed uses in the demo	2017-04-08 21:44:52 -04:00
mainwindow.h	OneSlotDS has been added to demo_r1	2016-12-06 00:27:22 +03:00
mainwindow.ui	Change to subforder project model.	2016-03-21 02:12:30 +01:00
r1.qrc	Change to subforder project model.	2016-03-21 02:12:30 +01:00