Merge branch origin/develop into accounts-integration
Conflicts: cmd/blocktest/main.go cmd/mist/debugger.go cmd/utils/cmd.go
This commit is contained in:
@@ -199,13 +199,6 @@ ApplicationWindow {
|
||||
|
||||
Menu {
|
||||
title: "Developer"
|
||||
MenuItem {
|
||||
iconSource: "../icecream.png"
|
||||
text: "Debugger"
|
||||
shortcut: "Ctrl+d"
|
||||
onTriggered: eth.startDebugger()
|
||||
}
|
||||
|
||||
MenuItem {
|
||||
text: "Import Tx"
|
||||
onTriggered: {
|
||||
@@ -761,24 +754,6 @@ ApplicationWindow {
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
height: 55
|
||||
color: "transparent"
|
||||
visible: true
|
||||
Text {
|
||||
text: "DEBUG"
|
||||
font.family: sourceSansPro.name
|
||||
font.weight: Font.DemiBold
|
||||
anchors {
|
||||
left: parent.left
|
||||
top: parent.verticalCenter
|
||||
leftMargin: 16
|
||||
}
|
||||
color: "#AAA0A0"
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
ColumnLayout {
|
||||
id: menuLegacy
|
||||
visible: true
|
||||
|
Reference in New Issue
Block a user