good morning!!!!

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

B

bor
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

7ee5cb0a

Commit 7ee5cb0a authored 10 years ago by Jeffrey Wilcke

Downloads
- Plain Diff

Merge branch 'develop' into rpcfrontier

parents 70f6f2af 9fb52c51

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

cmd/ethereum/js.go 4 additions, 2 deletions

cmd/ethereum/js.go
cmd/ethereum/main.go 3 additions, 10 deletions

cmd/ethereum/main.go
cmd/mist/assets/qml/views/miner.qml 29 additions, 29 deletions

cmd/mist/assets/qml/views/miner.qml
cmd/mist/assets/qml/views/network.qml 0 additions, 1 deletion

cmd/mist/assets/qml/views/network.qml
cmd/mist/ui_lib.go 4 additions, 14 deletions

cmd/mist/ui_lib.go
core/types/transaction.go 4 additions, 4 deletions

core/types/transaction.go
eth/backend.go 15 additions, 8 deletions

eth/backend.go
miner/miner.go 10 additions, 20 deletions

miner/miner.go
xeth/xeth.go 11 additions, 12 deletions

xeth/xeth.go

with 80 additions and 100 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment