Merge branch 'develop' into release/1.4

pull/2554/head v1.4.1
Jeffrey Wilcke 9 years ago
commit 4b9de75623
  1. 2
      cmd/geth/main.go

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

Loading…
Cancel
Save