Merge branch '15.06'

* 15.06:
  Fix poor visibility of MessageStack against grid
  Fix USB printer detection and reconnect after firmware update on MacOSX
  Correct the icon for the Cura .desktop file
  Bump version
  support defaults to ZigZag instead of Lines
  Fix the platform activity check
This commit is contained in:
Arjen Hiemstra 2015-08-18 17:59:16 +02:00
commit a425036c4c
3 changed files with 58 additions and 26 deletions

View file

@ -481,7 +481,6 @@ UM.MainWindow {
onAccepted:
{
UM.MeshFileHandler.readLocalFile(fileUrl)
Printer.setPlatformActivity(true)
}
}