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
..
data	Merge remote-tracking branch 'origin/master' into dev	2022-01-20 15:22:24 +01:00
fonts	Support of CJK languages in ImGUI:	2019-05-23 18:04:27 +02:00
icons	Merge branch 'master_250' (NO CONFLICTS FIXED):	2022-06-29 14:37:14 +02:00
localization	Merge branch 'master_250' (NO CONFLICTS FIXED):	2022-06-29 14:37:14 +02:00
profiles	Merge branch 'master_250' (NO CONFLICTS FIXED):	2022-06-29 14:37:14 +02:00
shaders	Fixed rendering of printbed while the camera is below it	2022-04-11 08:38:09 +02:00
shapes	Shapes Gallery: Added PLA_recycling_symbol	2022-04-12 09:15:55 +02:00
udev	Cleanup of file 90-3dconnexion.rules	2019-11-18 16:07:39 +01:00