Merge branch 'develop' into ui
Showing
- Dockerfile 9 additions, 5 deletionsDockerfile
- Godeps/Godeps.json 1 addition, 1 deletionGodeps/Godeps.json
- Godeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp 2 additions, 0 deletionsGodeps/_workspace/src/github.com/obscuren/qml/cpp/capi.cpp
- README.md 3 additions, 0 deletionsREADME.md
- cmd/mist/ext_app.go 1 addition, 1 deletioncmd/mist/ext_app.go
- cmd/mist/gui.go 1 addition, 4 deletionscmd/mist/gui.go
- cmd/mist/ui_lib.go 5 additions, 9 deletionscmd/mist/ui_lib.go
- core/filter.go 2 additions, 2 deletionscore/filter.go
- core/manager.go 1 addition, 2 deletionscore/manager.go
- eth/backend.go 19 additions, 63 deletionseth/backend.go
- miner/miner.go 4 additions, 4 deletionsminer/miner.go
- miner/worker.go 3 additions, 4 deletionsminer/worker.go
- ui/filter.go 1 addition, 1 deletionui/filter.go
- ui/qt/filter.go 1 addition, 1 deletionui/qt/filter.go
- xeth/xeth.go 9 additions, 5 deletionsxeth/xeth.go
Loading
Please register or sign in to comment