Merge branch '1.4'

Browse Source

# Conflicts:
#	limereport/items/lrtextitem.cpp
#	limereport/items/lrtextitem.h
#	limereport/lrdatasourcemanager.cpp
#	limereport/lrdatasourcemanager.h

...

This commit is contained in:

Arin Alexander

2017-03-01 00:40:36 +03:00

parent 034f254d5c e9957bd8b5

commit ddc793f6e4

126 changed files with 8954 additions and 1762 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

translations/limereport_ru.qm

Binary file not shown.