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
..
zint-2.4.4	Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport	2018-03-09 19:01:07 +01:00
3rdparty.pro	Update Fork	2016-03-24 15:10:44 +01:00