Fixed conflicts after merge with master

Browse Source

...

This commit is contained in:

enricoturri1966

2020-04-01 15:06:30 +02:00

parent d9d5722bf7 31b0ae164d

commit f598c2d5d8

229 changed files with 27582 additions and 16304 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/GLCanvas3D.cpp

+612 -149

File diff suppressed because it is too large Load Diff