diff options
author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
---|---|---|
committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-02 21:06:08 +0800 |
commit | 4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8 (patch) | |
tree | 1cc4369855586a5b59406d09299e89f8e3f9142d /cmd/mist/main.go | |
parent | cfe037028081ebb84ee35caa5b16fed5d125b58a (diff) | |
parent | 65cad14f9b27db396d036f47814d4843d947ac43 (diff) | |
download | dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.gz dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.tar.zst dexon-4cb0bfe9395f3a45fcea00bc753cbd2c20ca78e8.zip |
Merge branch 'develop' of github.com:ethereum/go-ethereum into removews
Conflicts:
cmd/ethereum/flags.go
cmd/mist/flags.go
Diffstat (limited to 'cmd/mist/main.go')
-rw-r--r-- | cmd/mist/main.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/mist/main.go b/cmd/mist/main.go index a330bbcb1..1d4403848 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -73,7 +73,7 @@ func run() error { utils.KeyTasks(ethereum.KeyManager(), KeyRing, GenAddr, SecretFile, ExportDir, NonInteractive) if StartRpc { - utils.StartRpc(ethereum, RpcPort) + utils.StartRpc(ethereum, RpcListenAddress, RpcPort) } gui := NewWindow(ethereum, config, KeyRing, LogLevel) |