Merge remote-tracking branch 'origin/master' into new_main_page_ui

Browse Source

...

This commit is contained in:

YuSanka committed 2018-06-12 13:03:40 +02:00

2 parents 08ccf85a61 303ed0e6c9

commit 6b56f99df7

31 files changed

+5197 -4520

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