Fixed conflicts after merging with master

Browse Source

...

This commit is contained in:

Enrico Turri

2018-08-27 14:00:53 +02:00

parent 220d430956 4522811f5b

commit fef5a5252e

38 changed files with 835 additions and 126 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

resources/icons/overlay/layflat_hover.png

BIN

Binary file not shown.

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

resources/icons/overlay/layflat_off.png

BIN

Binary file not shown.

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

resources/icons/overlay/layflat_on.png

BIN

Binary file not shown.

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