Fixed conflicts after merge with master

Browse Source

...

This commit is contained in:

enricoturri1966

2020-03-25 12:07:59 +01:00

parent 3b6d334d7b de06c5d659

commit a1a4d49f15

249 changed files with 51507 additions and 33844 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

src/slic3r/GUI/Plater.cpp

+274 -283

File diff suppressed because it is too large Load Diff