diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-19 01:42:01 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-19 01:42:01 +0800 |
| commit | f0bb13609939ebbee22e9c9f39c6742341b0d20b (patch) | |
| tree | f92e9d256edd93cb384a2c1f9bddc0084347ee38 /cmd/mist | |
| parent | f9a6038f5b82cad6956c9cbb7f1220d97570632b (diff) | |
| parent | c12046d6bfb197adb0004d629a783dd92f0cfc0f (diff) | |
| download | dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.gz dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.bz2 dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.lz dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.xz dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.tar.zst dexon-f0bb13609939ebbee22e9c9f39c6742341b0d20b.zip | |
Merge branch 'develop' into conversion
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/main.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index 1c51233e3..fab651b22 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -28,8 +28,8 @@ import ( "github.com/codegangsta/cli" "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/ui/qt/webengine" "github.com/obscuren/qml" @@ -66,6 +66,8 @@ func init() { utils.RPCListenAddrFlag, utils.RPCPortFlag, utils.JSpathFlag, + utils.ProtocolVersionFlag, + utils.NetworkIdFlag, } } |