Fixed conflict after merge with master

Browse Source

...

This commit is contained in:

Enrico Turri

2018-07-27 12:15:35 +02:00

parent ddda5062c2 987fc4c6df

commit 590773d77b

18 changed files with 4553 additions and 2760 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/GLCanvas3D.cpp

+522 -400

File diff suppressed because it is too large Load Diff