Merge branch 'master' of github.com:ethcore/parity
Showing
- .travis.yml 2 additions, 0 deletions.travis.yml
- Cargo.lock 29 additions, 23 deletionsCargo.lock
- ethcore/src/error.rs 8 additions, 28 deletionsethcore/src/error.rs
- sync/src/chain.rs 126 additions, 65 deletionssync/src/chain.rs
- sync/src/tests/chain.rs 31 additions, 9 deletionssync/src/tests/chain.rs
- sync/src/tests/helpers.rs 11 additions, 0 deletionssync/src/tests/helpers.rs
- util/src/error.rs 22 additions, 0 deletionsutil/src/error.rs
- util/src/keys/directory.rs 1088 additions, 0 deletionsutil/src/keys/directory.rs
- util/src/keys/mod.rs 19 additions, 0 deletionsutil/src/keys/mod.rs
- util/src/lib.rs 4 additions, 0 deletionsutil/src/lib.rs
- util/src/network/host.rs 1 addition, 0 deletionsutil/src/network/host.rs
- util/src/tests/helpers.rs 31 additions, 0 deletionsutil/src/tests/helpers.rs
- util/src/tests/mod.rs 1 addition, 0 deletionsutil/src/tests/mod.rs
Please register or sign in to comment