Fixed conflicts after merge with master

Browse source

...

This commit is contained in:

enricoturri1966 2020-09-08 11:50:11 +02:00

parent ab556a398b 1418b71541

commit 93ed04ef7b

2 changed files with 125 additions and 8 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

resources/icons/splashscreen.jpg Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 130 KiB