Fixing conflicts part 2:

Browse source

SeamPlacer.cpp/.hpp files from master_250 were used, there should be no changes
in master that will be overwritten, the feature was backported from master and
only developed in master_250 from then on

...

This commit is contained in:

Lukas Matena 2022-06-29 15:07:57 +02:00

parent 62e59a4526

commit e6d341f9f2

2 changed files with 0 additions and 809 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

724

src/libslic3r/GCode/SeamPlacer.cpp

View file

File diff suppressed because it is too large Load diff