Merge branch 'develop' of https://github.com/JosephGoulden/go-ethereum into JosephGoulden-develop

2478f49c · obscuren · 0a82e3b7 · d953415d · 2478f49c
Commit 2478f49c authored Sep 19, 2014 by obscuren
Hide 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 {