grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:ethcore/parity into move_hash

Browse Source
This commit is contained in:
debris
2016-08-04 08:41:30 +02:00
parent e8c451ac82 7093651d70
commit 03c3d16744
66 changed files with 1281 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
json/Cargo.toml
View File

@@ -10,7 +10,7 @@ rustc-serialize = "0.3"
serde = "0.7.0"
serde_json = "0.7.0"
serde_macros = { version = "0.7.0", optional = true }
clippy = { version = "0.0.79", optional = true}
clippy = { version = "0.0.80", optional = true}
[build-dependencies]
serde_codegen = { version = "0.7.0", optional = true }