Merge branch 'master' into wipe_tower_improvements

Browse Source

...

This commit is contained in:

Lukas Matena

2018-03-09 15:10:15 +01:00

parent 6e39f61198 83a2d2af4b

commit 1c6fa6660e

79 changed files with 34645 additions and 10116 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

xs/src/slic3r/GUI/Tab.cpp

+229 -222

File diff suppressed because it is too large Load Diff