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
..
designer.pro	Merge branch 'master' of https://github.com/Crystal-Photonics/LimeReport	2018-03-09 19:01:07 +01:00
main.cpp	load translation in designer has been added	2017-12-10 16:06:56 +03:00
main.ico	Designer project has been added	2016-07-21 12:48:22 +03:00
mainicon.rc	Designer project has been added	2016-07-21 12:48:22 +03:00