Merge branch '15.06'

Conflicts:
	cura/CuraApplication.py
This commit is contained in:
Arjen Hiemstra 2015-07-15 00:38:29 +02:00
commit d659e5b8b8
4 changed files with 55 additions and 7 deletions

View file

@ -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)