aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/geth/main.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-01 18:51:44 +0800
committerobscuren <geffobscura@gmail.com>2015-04-01 18:51:44 +0800
commitdba9b83aa07ced653b24c3e34d55ffe13a740243 (patch)
tree0dc20ee3807e3fe5a076fbfe2ec00bd6601792a6 /cmd/geth/main.go
parent4e8f8cfab701bb6c4ad2b8cf166d642f408ca398 (diff)
parentb0e09ec82752b48c2384c315dc420e5c39e785b6 (diff)
downloaddexon-dba9b83aa07ced653b24c3e34d55ffe13a740243.tar
dexon-dba9b83aa07ced653b24c3e34d55ffe13a740243.tar.gz
dexon-dba9b83aa07ced653b24c3e34d55ffe13a740243.tar.bz2
dexon-dba9b83aa07ced653b24c3e34d55ffe13a740243.tar.lz
dexon-dba9b83aa07ced653b24c3e34d55ffe13a740243.tar.xz
dexon-dba9b83aa07ced653b24c3e34d55ffe13a740243.tar.zst
dexon-dba9b83aa07ced653b24c3e34d55ffe13a740243.zip
Merge branch 'tgerring-hexify' into develop
Diffstat (limited to 'cmd/geth/main.go')
-rw-r--r--cmd/geth/main.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go
index 05e2e4ae6..62e30ac9a 100644
--- a/cmd/geth/main.go
+++ b/cmd/geth/main.go
@@ -233,6 +233,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso
utils.VMDebugFlag,
utils.ProtocolVersionFlag,
utils.NetworkIdFlag,
+ utils.RPCCORSDomainFlag,
}
// missing: