Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts: accounts/account_manager.go
No related branches found
No related tags found
Showing
- .travis.yml 2 additions, 2 deletions.travis.yml
- Godeps/Godeps.json 5 additions, 6 deletionsGodeps/Godeps.json
- Godeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE 0 additions, 20 deletionsGodeps/_workspace/src/bitbucket.org/kardianos/osext/LICENSE
- Godeps/_workspace/src/github.com/kardianos/osext/LICENSE 27 additions, 0 deletionsGodeps/_workspace/src/github.com/kardianos/osext/LICENSE
- Godeps/_workspace/src/github.com/kardianos/osext/README.md 14 additions, 0 deletionsGodeps/_workspace/src/github.com/kardianos/osext/README.md
- Godeps/_workspace/src/github.com/kardianos/osext/osext.go 0 additions, 5 deletionsGodeps/_workspace/src/github.com/kardianos/osext/osext.go
- Godeps/_workspace/src/github.com/kardianos/osext/osext_plan9.go 9 additions, 9 deletions.../_workspace/src/github.com/kardianos/osext/osext_plan9.go
- Godeps/_workspace/src/github.com/kardianos/osext/osext_procfs.go 5 additions, 2 deletions..._workspace/src/github.com/kardianos/osext/osext_procfs.go
- Godeps/_workspace/src/github.com/kardianos/osext/osext_sysctl.go 0 additions, 0 deletions..._workspace/src/github.com/kardianos/osext/osext_sysctl.go
- Godeps/_workspace/src/github.com/kardianos/osext/osext_test.go 0 additions, 0 deletions...s/_workspace/src/github.com/kardianos/osext/osext_test.go
- Godeps/_workspace/src/github.com/kardianos/osext/osext_windows.go 0 additions, 0 deletions...workspace/src/github.com/kardianos/osext/osext_windows.go
- accounts/account_manager.go 41 additions, 9 deletionsaccounts/account_manager.go
- accounts/accounts_test.go 51 additions, 2 deletionsaccounts/accounts_test.go
- cmd/mist/flags.go 1 addition, 30 deletionscmd/mist/flags.go
- cmd/utils/cmd.go 0 additions, 29 deletionscmd/utils/cmd.go
- core/block_processor.go 6 additions, 1 deletioncore/block_processor.go
- ethutil/common.go 29 additions, 0 deletionsethutil/common.go
- rpc/api.go 23 additions, 4 deletionsrpc/api.go
- rpc/messages.go 13 additions, 0 deletionsrpc/messages.go
- ui/frontend.go 18 additions, 0 deletionsui/frontend.go
Loading
Please register or sign in to comment