Merge branch 'develop' into release/1.4

This commit is contained in:
Jeffrey Wilcke 2016-05-03 14:05:30 +02:00
commit 4b9de75623
1 changed files with 1 additions and 1 deletions

View File

@ -507,7 +507,7 @@ func gpubench(ctx *cli.Context) {
func version(c *cli.Context) {
fmt.Println(clientIdentifier)
fmt.Println("Version:", version)
fmt.Println("Version:", verString)
fmt.Println("Protocol Versions:", eth.ProtocolVersions)
fmt.Println("Network Id:", c.GlobalInt(utils.NetworkIdFlag.Name))
fmt.Println("Go Version:", runtime.Version())