merge fixes

This commit is contained in:
Volker Fischer 2020-06-05 22:43:14 +02:00
parent a9dc06f167
commit 81d000b773

View file

@ -16,11 +16,11 @@
</qresource> </qresource>
<qresource prefix="/translations" lang="it"> <qresource prefix="/translations" lang="it">
<file alias="translation.qm">res/translation/translation_it_IT.qm</file> <file alias="translation.qm">res/translation/translation_it_IT.qm</file>
</qresource> </qresource>
<qresource prefix="/translations" lang="pl"> <qresource prefix="/translations" lang="pl">
<file alias="translation.qm">res/translation/translation_pl_PL.qm</file> <file alias="translation.qm">res/translation/translation_pl_PL.qm</file>
</qresource> </qresource>
<qresource prefix="/png/LEDs"> <qresource prefix="/png/LEDs">
<file>res/CLEDDisabledSmall.png</file> <file>res/CLEDDisabledSmall.png</file>
<file>res/CLEDGreenArrow.png</file> <file>res/CLEDGreenArrow.png</file>