Filip Sykala eba68f9a9e Merge branch 'master' into fs_emboss ... # Conflicts: # src/slic3r/GUI/GUI_ObjectList.cpp # src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp # src/slic3r/GUI/ImGuiWrapper.hpp		2021-11-23 09:09:09 +01:00
..
data	Localization fixes + new POT	2021-11-12 09:21:41 +01:00
fonts	Support of CJK languages in ImGUI:	2019-05-23 18:04:27 +02:00
icons	Merge branch 'master' into fs_emboss	2021-11-23 09:09:09 +01:00
localization	Localization + new POT	2021-11-15 08:32:40 +01:00
profiles	Sync with PrusaSlicer-settings	2021-11-16 21:07:10 +01:00
shaders	Removed obsolete gouraud shader files	2021-11-16 12:56:08 +01:00
shapes	ShapeGallery: Added more system shapes	2021-10-08 09:05:03 +02:00
udev	Cleanup of file 90-3dconnexion.rules	2019-11-18 16:07:39 +01:00