Filip Sykala - NTB T15p ed6a1b18f3 Merge branch 'master' into fs_emboss ... # Conflicts: # src/slic3r/GUI/GLCanvas3D.cpp # src/slic3r/GUI/Selection.cpp		2022-09-14 11:28:36 +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 'master' into fs_emboss	2022-09-14 11:28:36 +02:00
localization	Merge branch 'master_250'	2022-09-07 15:19:21 +02:00
profiles	Added thumbnail for Ender 5 Pro	2022-09-13 13:35:55 +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