3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-13 01:37:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix merge conflicts

Browse source
This commit is contained in:
ChrisTerBeke 2017-10-10 09:43:16 +02:00
commit 0b5fac28b9
23 changed files with 568 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
plugins/LayerView/LayerView.qml
View file

@ -1,7 +1,7 @@
// Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick 2.4
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.1
@ -379,4 +379,9 @@ Item
}
}
}
FontMetrics {
id: fontMetrics
font: UM.Theme.getFont("default")
}
}