Filip Sykala - NTB T15p c549c6afbe Merge branch 'master' into fs_emboss ... # Conflicts: # src/libslic3r/CMakeLists.txt # src/libslic3r/Format/3mf.cpp # src/libslic3r/Model.hpp # src/libslic3r/Point.hpp # src/libslic3r/Technologies.hpp # src/slic3r/CMakeLists.txt # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/GLSelectionRectangle.cpp # src/slic3r/GUI/GUI_Factories.hpp # src/slic3r/GUI/Gizmos/GLGizmoBase.cpp # src/slic3r/GUI/Gizmos/GLGizmoBase.hpp # src/slic3r/GUI/Gizmos/GLGizmoMove.cpp # src/slic3r/GUI/Gizmos/GLGizmoMove.hpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp # src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp # src/slic3r/GUI/MeshUtils.cpp # src/slic3r/GUI/MeshUtils.hpp # src/slic3r/GUI/ObjectDataViewModel.cpp # src/slic3r/GUI/ObjectDataViewModel.hpp # src/slic3r/GUI/Selection.cpp		2022-08-31 15:22:10 +02:00
..
data	Merge branch 'et_world_coordinates' into fs_emboss	2022-07-20 13:02:07 +02:00
fonts	Support of CJK languages in ImGUI:	2019-05-23 18:04:27 +02:00
icons	Merge branch 'et_world_coordinates' into fs_emboss	2022-07-20 13:02:07 +02:00
localization	Merge branch 'master_250'	2022-08-30 16:31:07 +02:00
profiles	Merge branch 'master_250'	2022-08-30 16:31:07 +02:00
shaders	Added shaders for OpenGL ES	2022-07-21 10:18:18 +02:00
shapes	Gallery: Update for recycling symbols	2022-07-21 10:44:09 +02:00
udev	Cleanup of file 90-3dconnexion.rules	2019-11-18 16:07:39 +01:00