Lukas Matena b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED): ... CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250. Version master_250 of t/perimeters.t left in tree. CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp CONFLICT (content): Merge conflict in version.inc CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250. Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.		2022-06-29 14:37:14 +02:00
..
combineinfill.t	Further Perl unit test porting to C++ and Perl interface reduction:	2022-05-05 17:57:57 +02:00
gcode.t	Further Perl unit test porting to C++ and Perl interface reduction:	2022-05-05 17:57:57 +02:00
geometry.t
layers.t
perimeters.t	Fixed infill polygons filtering.	2022-06-16 14:01:56 +02:00
retraction.t
shells.t
skirt_brim.t