Fixed conflicts after merge with master

Browse Source

...

This commit is contained in:

enricoturri1966

2020-05-28 15:50:21 +02:00

parent 96db6aaadb 0599dc4df7

commit e9d57c932a

18 changed files with 230 additions and 58 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/Pmetal_001.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 79 KiB