Merge branch 'master' into mul_fix
Conflicts: src/uint.rs
Showing
- Cargo.toml 1 addition, 0 deletionsCargo.toml
- src/bytes.rs 1 addition, 1 deletionsrc/bytes.rs
- src/common.rs 1 addition, 0 deletionssrc/common.rs
- src/from_json.rs 12 additions, 0 deletionssrc/from_json.rs
- src/hash.rs 25 additions, 10 deletionssrc/hash.rs
- src/json_aid.rs 102 additions, 32 deletionssrc/json_aid.rs
- src/lib.rs 7 additions, 3 deletionssrc/lib.rs
- src/misc.rs 31 additions, 0 deletionssrc/misc.rs
- src/sha3.rs 4 additions, 4 deletionssrc/sha3.rs
- src/standard.rs 3 additions, 1 deletionsrc/standard.rs
- src/trie/triedbmut.rs 3 additions, 0 deletionssrc/trie/triedbmut.rs
- src/uint.rs 85 additions, 44 deletionssrc/uint.rs
Please register or sign in to comment