Merge branch 'master' into jsonrpc2
Showing
- .travis.yml 9 additions, 4 deletions.travis.yml
- Cargo.lock 94 additions, 80 deletionsCargo.lock
- Cargo.toml 5 additions, 2 deletionsCargo.toml
- README.md 10 additions, 10 deletionsREADME.md
- ethash/Cargo.toml 0 additions, 1 deletionethash/Cargo.toml
- ethash/src/lib.rs 51 additions, 7 deletionsethash/src/lib.rs
- ethcore/Cargo.toml 4 additions, 2 deletionsethcore/Cargo.toml
- ethcore/src/block.rs 1 addition, 1 deletionethcore/src/block.rs
- ethcore/src/client.rs 1 addition, 1 deletionethcore/src/client.rs
- ethcore/src/evm/interpreter.rs 2 additions, 2 deletionsethcore/src/evm/interpreter.rs
- ethcore/src/lib.rs 2 additions, 6 deletionsethcore/src/lib.rs
- ethcore/src/receipt.rs 1 addition, 1 deletionethcore/src/receipt.rs
- ethcore/src/service.rs 3 additions, 0 deletionsethcore/src/service.rs
- ethcore/src/state.rs 6 additions, 7 deletionsethcore/src/state.rs
- install-deps.sh 13 additions, 15 deletionsinstall-deps.sh
- parity/main.rs 100 additions, 54 deletionsparity/main.rs
- rpc/Cargo.toml 14 additions, 4 deletionsrpc/Cargo.toml
- rpc/build.rs 29 additions, 0 deletionsrpc/build.rs
- rpc/src/lib.rs 6 additions, 37 deletionsrpc/src/lib.rs
- rpc/src/lib.rs.in 30 additions, 0 deletionsrpc/src/lib.rs.in
Please register or sign in to comment