Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

This commit is contained in:
Tamara Hogenhout 2015-09-08 16:30:38 +02:00
commit 34c252b2db
2 changed files with 9 additions and 1 deletions

View file

@ -197,7 +197,8 @@ UM.MainWindow
{
id: sub_menu
title: model.name;
visible: actions != null
enabled:actions != null
Instantiator
{
model: actions