diff options
| author | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2015-03-19 19:17:43 +0800 |
| commit | e13c6739804604849c7e43d27b073e68fba58191 (patch) | |
| tree | b3471931b63210a4d107875dffd6572bcd96239e /cmd/mist/main.go | |
| parent | 965c9babe336cfa8d5c740d5356acbc5f9ba4a72 (diff) | |
| parent | 5f35e6778f10d9e2c6418beff7ed201be80448c4 (diff) | |
| download | dexon-e13c6739804604849c7e43d27b073e68fba58191.tar dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.gz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.bz2 dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.lz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.xz dexon-e13c6739804604849c7e43d27b073e68fba58191.tar.zst dexon-e13c6739804604849c7e43d27b073e68fba58191.zip | |
Merge remote-tracking branch 'ethereum/conversion' into conversion
Diffstat (limited to 'cmd/mist/main.go')
| -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, } } |