Merge branch 'release/0.6.3'

obscuren · obscuren · commit ed73fc0be3ab · 2014-08-21T15:45:50.000+02:00
diff --git a/ethereal/assets/qml/wallet.qml b/ethereal/assets/qml/wallet.qml
@@ -659,7 +659,7 @@ ApplicationWindow {
 			     anchors.left: aboutIcon.right
 			     anchors.leftMargin: 10
 			     font.pointSize: 12
-			     text: "<h2>Ethereal - Adrastea</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>Viktor Trón<br>"
+			     text: "<h2>Ethereal - Aitne</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>Viktor Trón<br>"
 		     }
 	     }
 

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ ApplicationWindow {`
`659`	`659`	`anchors.left: aboutIcon.right`
`660`	`660`	`anchors.leftMargin: 10`
`661`	`661`	`font.pointSize: 12`
`662`		`- text: "<h2>Ethereal - Adrastea</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>Viktor Trón<br>"`
	`662`	`+ text: "<h2>Ethereal - Aitne</h2><br><h3>Development</h3>Jeffrey Wilcke<br>Maran Hidskes<br>Viktor Trón<br>"`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`