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

b3161f58

Commit b3161f58 authored 10 years ago by Viktor Trón

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/develop' into develop

parents 5a9952c7 26f066f0

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

cmd/mist/assets/ext/eth.js/main.js 1 addition, 0 deletions

cmd/mist/assets/ext/eth.js/main.js
cmd/mist/assets/qml/browser.qml 28 additions, 18 deletions

cmd/mist/assets/qml/browser.qml
cmd/mist/assets/qml/main.qml 2 additions, 2 deletions

cmd/mist/assets/qml/main.qml
cmd/mist/gui.go 137 additions, 83 deletions

cmd/mist/gui.go
core/chain_manager.go 2 additions, 2 deletions

core/chain_manager.go
core/chain_manager_test.go 4 additions, 4 deletions

core/chain_manager_test.go
core/genesis.go 1 addition, 0 deletions

core/genesis.go
eth/backend.go 3 additions, 7 deletions

eth/backend.go
ethutil/path.go 1 addition, 1 deletion

ethutil/path.go
ethutil/rlp.go 1 addition, 1 deletion

ethutil/rlp.go
ui/qt/qwhisper/whisper.go 7 additions, 3 deletions

ui/qt/qwhisper/whisper.go
whisper/message.go 2 additions, 0 deletions

whisper/message.go
whisper/peer.go 1 addition, 1 deletion

whisper/peer.go
whisper/whisper.go 4 additions, 1 deletion

whisper/whisper.go

with 194 additions and 123 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