Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp

Browse source

...

This commit is contained in:

Enrico Turri 2018-07-24 11:20:02 +02:00

parent c68bcb9e60 dfb70ec6e6

commit 8bf3e63f75

24 changed files with 93 additions and 76 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/bed/mk2_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 100 KiB After Width:  |  Height:  |  Size: 33 KiB

BIN

resources/icons/bed/mk3_bottom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 170 KiB After Width:  |  Height:  |  Size: 23 KiB

BIN

resources/icons/bed/mk3_top.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 83 KiB After Width:  |  Height:  |  Size: 30 KiB