enricoturri1966 520261925f Fixed conflicts after merge with master		2022-07-21 08:14:44 +02:00
..
data	Merge branch 'master_250'	2022-07-15 15:04:10 +02:00
fonts
icons	Merge branch 'master_250' (NO CONFLICTS FIXED):	2022-06-29 14:37:14 +02:00
localization	Merge branch 'master_250'	2022-07-15 15:04:10 +02:00
profiles	Fixing conflicts part 1:	2022-06-29 16:43:29 +02:00
shaders	Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders	2022-05-26 12:25:55 +02:00
shapes	Shapes Gallery: Added PLA_recycling_symbol	2022-04-12 09:15:55 +02:00
udev