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
..
backend	Zint has been pached for MSVC2010	2016-03-22 15:49:35 +03:00
backend_qt4	Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport	2018-03-09 19:01:07 +01:00
COPYING	COPYING has been added to zint	2016-03-22 15:52:57 +03:00