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

This commit is contained in:
Jaime van Kessel 2019-09-03 11:27:38 +02:00
commit c2225c9afc
No known key found for this signature in database
GPG key ID: 3710727397403C91
9 changed files with 33 additions and 17 deletions

View file

@ -1,8 +1,12 @@
import QtQuick 2.0
// Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.10
import QtQuick.Controls 2.3
import Cura 1.6 as Cura
import UM 1.2 as UM
import Cura 1.6 as Cura
Popup
{
id: popup