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

2014-06-26 16:33:40 +01:00
parent 21d86ca486 b89076faa2
commit 648c418fcd
3 changed files with 32 additions and 22 deletions
--- a/ethereal/ui/gui.go
+++ b/ethereal/ui/gui.go
@@ -173,10 +173,6 @@ func (gui *Gui) createWindow(comp qml.Object) *qml.Window {
 	gui.win = win
 	gui.uiLib.win = win

-	db := &Debugger{gui.win, make(chan bool), make(chan bool), true, false}
-	gui.lib.Db = db
-	gui.uiLib.Db = db
-
 	return gui.win
 }
 func (gui *Gui) setInitialBlockChain() {