Merge branch 'master' of github.com:ethcore/parity into jsonrpc
Showing
- README.md 2 additions, 2 deletionsREADME.md
- cov.sh 7 additions, 2 deletionscov.sh
- docker/ubuntu-dev/Dockerfile 1 addition, 0 deletionsdocker/ubuntu-dev/Dockerfile
- docker/ubuntu-jit/Dockerfile 1 addition, 0 deletionsdocker/ubuntu-jit/Dockerfile
- docker/ubuntu/Dockerfile 1 addition, 0 deletionsdocker/ubuntu/Dockerfile
- ethcore/res/ethereum/frontier.json 2 additions, 1 deletionethcore/res/ethereum/frontier.json
- ethcore/src/block_queue.rs 20 additions, 4 deletionsethcore/src/block_queue.rs
- ethcore/src/client.rs 6 additions, 2 deletionsethcore/src/client.rs
- parity/main.rs 16 additions, 1 deletionparity/main.rs
- sync/Cargo.toml 1 addition, 1 deletionsync/Cargo.toml
- sync/src/chain.rs 367 additions, 13 deletionssync/src/chain.rs
- sync/src/lib.rs 7 additions, 0 deletionssync/src/lib.rs
- sync/src/tests/chain.rs 44 additions, 0 deletionssync/src/tests/chain.rs
- sync/src/tests/helpers.rs 42 additions, 6 deletionssync/src/tests/helpers.rs
- util/src/network/host.rs 3 additions, 0 deletionsutil/src/network/host.rs
Please register or sign in to comment