mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-08-09 06:45:09 -06:00
Merge branch '15.06'
Conflicts: cura/CuraApplication.py
This commit is contained in:
commit
d659e5b8b8
4 changed files with 55 additions and 7 deletions
|
@ -31,7 +31,7 @@ UM.Dialog {
|
|||
Label {
|
||||
id: version
|
||||
|
||||
text: "Cura 15.06"
|
||||
text: "Cura %1".arg(UM.Application.version)
|
||||
font: UM.Theme.fonts.large
|
||||
anchors.horizontalCenter : logo.horizontalCenter
|
||||
anchors.horizontalCenterOffset : (logo.width * 0.25)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue