Merge remote-tracking branch 'origin/master' into shader_optimization

This commit is contained in:
Lipu Fei 2019-05-16 14:22:05 +02:00
commit dab0a43214
304 changed files with 53275 additions and 18828 deletions

View file

@ -15,6 +15,8 @@ Cura.ExpandableComponent
{
id: base
dragPreferencesNamePrefix: "view/colorscheme"
contentHeaderTitle: catalog.i18nc("@label", "Color scheme")
Connections