Merge branch '3.5' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2018-09-12 13:38:56 +02:00
commit 00494d8301

View file

@ -36,6 +36,7 @@ Item
} }
} }
/* // NOTE: Remember to re-enable for v3.6!
ToolboxTabButton ToolboxTabButton
{ {
id: materialsTabButton id: materialsTabButton
@ -49,6 +50,7 @@ Item
toolbox.viewPage = "overview" toolbox.viewPage = "overview"
} }
} }
*/
} }
ToolboxTabButton ToolboxTabButton
{ {