Merge branch '3.0' of github.com:Ultimaker/cura into 3.0

This commit is contained in:
alekseisasin 2017-09-28 13:24:13 +02:00
commit 2a302a3e27
231 changed files with 3607 additions and 2600 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.2
import QtQuick.Controls 1.1