Filip Sykala - NTB T15p 7c1a513e5a Merge branch 'master' into fs_emboss ... # Conflicts: # src/slic3r/GUI/GLCanvas3D.cpp		2022-11-21 10:16:25 +01: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-11-07 15:44:33 +01:00
localization	Merge remote-tracking branch 'PRIVATE/ys_cut' into master	2022-10-27 10:21:23 +02:00
profiles	Sync with PrusaSlicer-settings	2022-11-21 09:24:37 +01: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