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

125bdc32

Commit 125bdc32 authored 10 years ago by Jeffrey Wilcke

Downloads
- Plain Diff

Merge branch 'develop' into poc8

Conflicts:
	cmd/ethereum/flags.go

parents 75f0412f 6cff6dd8

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

cmd/ethereum/flags.go 1 addition, 1 deletion

cmd/ethereum/flags.go
cmd/ethereum/main.go 1 addition, 1 deletion

cmd/ethereum/main.go
cmd/mist/assets/qml/main.qml 4 additions, 4 deletions

cmd/mist/assets/qml/main.qml
cmd/mist/flags.go 1 addition, 1 deletion

cmd/mist/flags.go
cmd/mist/main.go 1 addition, 1 deletion

cmd/mist/main.go
core/block_manager.go 3 additions, 1 deletion

core/block_manager.go
core/execution.go 14 additions, 19 deletions

core/execution.go
core/state_transition.go 20 additions, 14 deletions

core/state_transition.go
core/types/transaction.go 10 additions, 9 deletions

core/types/transaction.go
state/state.go 7 additions, 0 deletions

state/state.go
vm/environment.go 5 additions, 0 deletions

vm/environment.go
vm/vm_debug.go 22 additions, 19 deletions

vm/vm_debug.go

with 89 additions and 70 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