Filip Sykala d698df2c31 Merge branch 'master' into fs_emboss ... # Conflicts: # src/slic3r/GUI/GUI_App.cpp # tests/libslic3r/test_indexed_triangle_set.cpp		2021-12-01 14:35:42 +01:00
..
data	Merge branch 'master' into fs_emboss	2021-12-01 14:35:42 +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: Updated CZ, DE, ES, FR, IT and PL dictionaries.	2021-12-01 13:07:25 +01:00
profiles	Sync with PrusaSlicer-settings	2021-12-01 13:11:47 +01:00
shaders	gouraud.fs shader - removed unused code	2021-12-01 12:37:39 +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