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

2016-08-04 08:41:30 +02:00
parent e8c451ac82 7093651d70
commit 03c3d16744
66 changed files with 1281 additions and 600 deletions
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -23,7 +23,7 @@ ethcore-devtools = { path = "../devtools" }
 rustc-serialize = "0.3"
 transient-hashmap = "0.1"
 serde_macros = { version = "0.7.0", optional = true }
-clippy = { version = "0.0.79", optional = true}
+clippy = { version = "0.0.80", optional = true}
 json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
 ethcore-ipc = { path = "../ipc/rpc" }