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

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

limereport/items/images/barcode4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 171 B

BIN

limereport/items/images/barcode5.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 221 B

BIN

limereport/items/images/imageItem4.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 259 B

BIN

limereport/items/images/insert-text_6.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 409 B After Width:  |  Height:  |  Size: 226 B

BIN

limereport/items/images/shapes7.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 648 B