Merge branch 'master' into coverage-effort
Conflicts: ethcore/res/ethereum/tests
Showing
- .gitmodules 0 additions, 4 deletions.gitmodules
- .travis.yml 44 additions, 13 deletions.travis.yml
- Cargo.toml 15 additions, 19 deletionsCargo.toml
- ethash/Cargo.toml 2 additions, 0 deletionsethash/Cargo.toml
- ethash/src/compute.rs 57 additions, 1 deletionethash/src/compute.rs
- ethash/src/lib.rs 27 additions, 12 deletionsethash/src/lib.rs
- ethcore/Cargo.toml 30 additions, 0 deletionsethcore/Cargo.toml
- ethcore/res/ethereum/frontier.json 0 additions, 0 deletionsethcore/res/ethereum/frontier.json
- ethcore/res/ethereum/frontier_like_test.json 0 additions, 0 deletionsethcore/res/ethereum/frontier_like_test.json
- ethcore/res/ethereum/frontier_test.json 0 additions, 0 deletionsethcore/res/ethereum/frontier_test.json
- ethcore/res/ethereum/homestead_test.json 0 additions, 0 deletionsethcore/res/ethereum/homestead_test.json
- ethcore/res/ethereum/morden.json 0 additions, 0 deletionsethcore/res/ethereum/morden.json
- ethcore/res/ethereum/olympic.json 0 additions, 0 deletionsethcore/res/ethereum/olympic.json
- ethcore/res/null_morden.json 0 additions, 0 deletionsethcore/res/null_morden.json
- ethcore/src/account.rs 0 additions, 0 deletionsethcore/src/account.rs
- ethcore/src/account_diff.rs 0 additions, 0 deletionsethcore/src/account_diff.rs
- ethcore/src/action_params.rs 0 additions, 0 deletionsethcore/src/action_params.rs
- ethcore/src/basic_types.rs 0 additions, 0 deletionsethcore/src/basic_types.rs
- ethcore/src/block.rs 0 additions, 0 deletionsethcore/src/block.rs
- ethcore/src/block_queue.rs 0 additions, 0 deletionsethcore/src/block_queue.rs
Please register or sign in to comment