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

Browse source

...

This commit is contained in:

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

parent 08ccf85a61 303ed0e6c9

commit 6b56f99df7

31 changed files with 5197 additions and 4520 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