gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix merge conflicts

Browse Source
This commit is contained in:
Maran
2014-04-11 13:33:08 -04:00
parent cf1ae41bc0 8280dd65e6
commit 4d18798468
4 changed files with 150 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ethereal/ui/gui.go
View File

@ -116,6 +116,7 @@ func (ui *Gui) Start(assetPath string) {
ui.engine.LoadFile(uiLib.AssetPath("qml/transactions.qml"))
ui.win = component.CreateWindow(nil)
uiLib.win = ui.win
// Register the ui as a block processor
//ui.eth.BlockManager.SecondaryBlockProcessor = ui