gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ethereum/go-ethereum into removews

Browse Source 
Conflicts:
	cmd/ethereum/flags.go
	cmd/mist/flags.go
This commit is contained in:
Taylor Gerring
2015-03-02 07:06:08 -06:00
parent cfe0370280 65cad14f9b
commit 4cb0bfe939
15 changed files with 153 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/mist/main.go
View File

@ -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)