Merge branch 'develop' into poc8

Conflicts: cmd/ethereum/flags.go
2014-12-20 02:45:05 +01:00
parent 75f0412f9d 6cff6dd8b8
commit 125bdc3253
12 changed files with 91 additions and 72 deletions
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@ -30,7 +30,7 @@ import (

 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.7.9"
+	Version          = "0.7.10"
 )

 var clilogger = logger.NewLogger("CLI")