3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-05 13:03:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

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

Browse source
This commit is contained in:
Jaime van Kessel 2018-01-08 10:56:12 +01:00
commit ed9634ebe0
77 changed files with 2675 additions and 791 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Settings/SettingUnknown.qml
View file

@ -1,8 +1,8 @@
// Copyright (c) 2015 Ultimaker B.V.
// Uranium is released under the terms of the LGPLv3 or higher.
import QtQuick 2.1
import QtQuick.Controls 1.1
import QtQuick 2.7
import QtQuick.Controls 2.0
import UM 1.2 as UM