Merge branch 'frontier/natspec' of https://github.com/ethersphere/go-ethereum into ethersphere-frontier/natspec

2015-04-20 18:08:14 +02:00
parent 76025cc424 093a9106b0
commit 36ec42e50c
18 changed files with 5108 additions and 85 deletions
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@ -231,6 +231,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
 		utils.MinerThreadsFlag,
 		utils.MiningEnabledFlag,
 		utils.NATFlag,
+		utils.NatspecEnabledFlag,
 		utils.NodeKeyFileFlag,
 		utils.NodeKeyHexFlag,
 		utils.RPCEnabledFlag,