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

Browse Source

...

This commit is contained in:

Enrico Turri

2018-07-30 08:33:28 +02:00

parent e1a13e9f08 4a88075334

commit 22f02acc3d

5 changed files with 92 additions and 61 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/printers/PrusaResearch_MK3MM2.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 41 KiB

BIN

resources/icons/printers/PrusaResearch_MK3MMU2.png Normal file

Binary file not shown.

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