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

Browse Source

...

This commit is contained in:

Enrico Turri committed 2018-06-12 08:32:34 +02:00

2 parents 44220530cb a194d28b14

commit 5f02669d2d

17 files changed

+160 -20

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

No files matched your search

resources/icons/printers/BarBaz_M1.png

BIN

Binary file not shown.

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

resources/icons/printers/BarBaz_M2.png

BIN

Binary file not shown.

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

resources/icons/printers/BarBaz_M3.png

BIN

Binary file not shown.

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

resources/icons/printers/Foobar_M1.png

BIN

Binary file not shown.

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

resources/icons/printers/Foobar_M2.png

BIN

Binary file not shown.

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

resources/icons/printers/Foobar_M3.png

BIN

Binary file not shown.

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

resources/icons/printers/PrusaResearch_MK2.5.png

BIN

Binary file not shown.

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