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
..
qzint_global.h	Static build has been fixed.	2017-06-16 03:06:09 +03:00
qzint.cpp	Qzint , need change pro from lib to subfolder, config +=ordered, to add	2016-03-21 00:49:04 +01:00
qzint.h	Qzint , need change pro from lib to subfolder, config +=ordered, to add	2016-03-21 00:49:04 +01:00
Zint.pro	Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport	2018-03-09 19:01:07 +01:00