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

3aa0410f

Commit 3aa0410f authored 10 years ago by Paweł Bylica

Downloads
- Plain Diff

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

parents d5f38f56 d792e95c

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

README.md 1 addition, 1 deletion

README.md
cmd/mist/assets/qml/browser.qml 7 additions, 25 deletions

cmd/mist/assets/qml/browser.qml
cmd/mist/assets/qml/main.qml 30 additions, 33 deletions

cmd/mist/assets/qml/main.qml
cmd/mist/assets/qml/views/whisper.qml 0 additions, 1 deletion

cmd/mist/assets/qml/views/whisper.qml
cmd/mist/ui_lib.go 2 additions, 7 deletions

cmd/mist/ui_lib.go
crypto/crypto.go 111 additions, 1 deletion

crypto/crypto.go
crypto/crypto_test.go 13 additions, 1 deletion

crypto/crypto_test.go
crypto/key.go 5 additions, 4 deletions

crypto/key.go
crypto/key_store_passphrase.go 1 addition, 45 deletions

crypto/key_store_passphrase.go
crypto/key_store_test.go 13 additions, 0 deletions

crypto/key_store_test.go
whisper/peer.go 1 addition, 1 deletion

whisper/peer.go

with 184 additions and 119 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