Merge branch 'hotfix/0.6.5-1'

29ca238a · obscuren · 154ca032 · 6e4818d7 · 29ca238a
Commit 29ca238a authored Sep 23, 2014 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

wallet.qml mist/assets/qml/wallet.qml +4 -0

No files found.
--- a/mist/assets/qml/wallet.qml
+++ b/mist/assets/qml/wallet.qml
@@ -195,6 +195,7 @@ ApplicationWindow {

            MenuSeparator {}

+	    /*
            MenuItem {
                id: miningSpeed
                text: "Mining: Turbo"
@@ -207,6 +208,7 @@ ApplicationWindow {
                    }
                }
            }
+	    */
        }

        Menu {
@@ -646,6 +648,8 @@ ApplicationWindow {
                      }

                      Keys.onReturnPressed: {
+			  if(this.text == "uuddlrlrba") { gui.toggleTurboMining(); }
+
                          addPlugin(this.text, {close: true, section: "apps"})
                      }
                  }