Merge branch '3.0'

This commit is contained in:
Mark 2017-09-28 13:01:10 +02:00
commit b4154b8cc0
205 changed files with 367 additions and 863 deletions

View file

@ -1,5 +1,5 @@
// Copyright (c) 2016 Ultimaker B.V.
// Cura is released under the terms of the AGPLv3 or higher.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.1
import QtQuick.Controls 1.1