mirrors/LimeReport
0
0
Fork 0
mirror of https://github.com/fralx/LimeReport.git synced 2025-10-01 11:31:10 +03:00
Code Activity

Merge branch 'develop' into 1.4_ChartItem

Browse Source 
Conflicts:
	limereport/items/items.qrc
	limereport/limereport.pri
This commit is contained in:
Arin Alex
2017-07-12 21:40:24 +03:00
parent 6127db13e6 49b6e9500a
commit c090883cf1
175 changed files with 12162 additions and 2484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
limereport/items/items.qrc
View File

@@ -11,10 +11,10 @@
<file>images/insert-text_5.png</file>
<file>images/shape5.png</file>
<file>images/imageItem1.png</file>
<file alias="ImageItem">images/imageItem2.png</file>
<file>images/imageItem2.png</file>
<file>images/settings.png</file>
<file>images/settings2.png</file>
<file alias="HorizontalLayout">images/hlayuot_3_24.png</file>
<file>images/hlayuot_3_24.png</file>
<file alias="Band">images/addBand1.png</file>
<file>images/DataBand.png</file>
<file>images/PageHeader.png</file>
@@ -34,9 +34,13 @@
<file alias="GroupBandHeader">images/GroupHeader16.png</file>
<file alias="PageItemDesignIntf">images/ReportPage16.png</file>
<file alias="TextItem">images/insert-text_6.png</file>
<file alias="BarcodeItem">images/barcode3.png</file>
<file alias="ShapeItem">images/shape6.png</file>
<file alias="ImageItem">images/imageItem3.png</file>
<file>images/barcode3.png</file>
<file>images/shape6.png</file>
<file>images/imageItem3.png</file>
<file>images/barcode4.png</file>
<file alias="ImageItem">images/imageItem4.png</file>
<file alias="ShapeItem">images/shapes7.png</file>
<file alias="BarcodeItem">images/barcode5.png</file>
<file alias="ChartItem">images/pie_chart2.png</file>
</qresource>
</RCC>