Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/logging

This commit is contained in:
zelig
2014-06-26 16:33:40 +01:00
3 changed files with 32 additions and 22 deletions

View File

@@ -10,9 +10,9 @@ ApplicationWindow {
visible: false
title: "IceCREAM"
minimumWidth: 1280
minimumHeight: 900
minimumHeight: 700
width: 1290
height: 900
height: 700
property alias codeText: codeEditor.text
property alias dataText: rawDataField.text
@@ -56,7 +56,7 @@ ApplicationWindow {
Rectangle {
color: "#00000000"
height: 500
height: 330
anchors.left: parent.left
anchors.right: parent.right
@@ -208,6 +208,12 @@ ApplicationWindow {
}
text: "Next"
}
CheckBox {
id: breakEachLine
objectName: "breakEachLine"
text: "Break each instruction"
checked: true
}
}
}