mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-09 05:57:14 +03:00
Code Activity

Merge branch 'master' into 1.4

Browse Source 
Conflicts:
	limereport/lrpreviewreportwindow.cpp
	limereport/lrpreviewreportwindow.h
	limereport/report.qrc
This commit is contained in:
Arin Alex
2016-08-08 15:53:39 +03:00
parent 7a1a3ac34a 1320c6f8ee
commit 4370182106
15 changed files with 84 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
limereport/report.qrc
View File

@@ -167,5 +167,8 @@
<file alias="/images/logo32">images/logo_32x32.png</file>
<file alias="/images/addPage">images/addPage1.png</file>
<file alias="/images/deletePage">images/deletePage1.png</file>
<file alias="/images/toolbar">images/toolbar.png</file>
<file>images/not_checked.png</file>
<file>images/checked.png</file>
</qresource>
</RCC>