Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Showing
- .travis.yml 7 additions, 10 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
- README.md 4 additions, 4 deletionsREADME.md
- accounts/account_manager.go 46 additions, 9 deletionsaccounts/account_manager.go
- accounts/accounts_test.go 69 additions, 5 deletionsaccounts/accounts_test.go
- cmd/ethereum/flags.go 4 additions, 9 deletionscmd/ethereum/flags.go
- cmd/ethereum/main.go 3 additions, 2 deletionscmd/ethereum/main.go
- cmd/ethtest/main.go 2 additions, 2 deletionscmd/ethtest/main.go
- cmd/mist/assets/examples/bomb.html 22 additions, 0 deletionscmd/mist/assets/examples/bomb.html
- cmd/mist/assets/examples/coin.html 28 additions, 17 deletionscmd/mist/assets/examples/coin.html
- cmd/mist/assets/examples/info.html 5 additions, 2 deletionscmd/mist/assets/examples/info.html
Loading
Please register or sign in to comment