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

Browse source

...

This commit is contained in:

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

parent 44220530cb a194d28b14

commit 5f02669d2d

17 changed files with 160 additions and 20 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/BarBaz_M1.png

View file

Binary file not shown.

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

BIN

resources/icons/printers/BarBaz_M2.png

View file

Binary file not shown.

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

BIN

resources/icons/printers/BarBaz_M3.png

View file

Binary file not shown.

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

BIN

resources/icons/printers/Foobar_M1.png

View file

Binary file not shown.

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

BIN

resources/icons/printers/Foobar_M2.png

View file

Binary file not shown.

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

BIN

resources/icons/printers/Foobar_M3.png

View file

Binary file not shown.

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

BIN

resources/icons/printers/PrusaResearch_MK2.5.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 58 KiB