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

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

limereport/images/checked.png

BIN

Binary file not shown.

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

limereport/images/not_checked.png

BIN

Binary file not shown.

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

limereport/images/toolbar.png

BIN

Binary file not shown.

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