Merge branch 'JosephGoulden-develop' into develop

e429e261 · obscuren · 0a82e3b7 · 2478f49c · e429e261
Commit e429e261 authored Sep 19, 2014 by obscuren
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

wallet.qml Mist/assets/qml/wallet.qml +1 -1

No files found.
--- a/Mist/assets/qml/wallet.qml
+++ b/Mist/assets/qml/wallet.qml
@@ -101,7 +101,7 @@ ApplicationWindow {
        }
    }

-    MenuBar {
+    menuBar: MenuBar {
        Menu {
            title: "File"
            MenuItem {