Merge branch 'poc-9' of github.com-obscure:ethereum/go-ethereum into poc-9

2015-03-06 16:40:21 +01:00
parent 8d9be18b29 e64f727529
commit 548e104171
126 changed files with 9960 additions and 5685 deletions
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -30,10 +30,7 @@ type Vm struct {

 func New(env Environment) *Vm {
 	lt := LogTyPretty
-	if ethutil.Config.Diff {
-		lt = LogTyDiff
-	}
-
+	// lt = LogTyDiff
 	return &Vm{debug: true, env: env, logTy: lt, Recoverable: true}
 }