Merge branch 'master' into check-updates

2016-12-04 09:01:50 -08:00
parent 8e2aca719f 0c7b7fc8bc
commit 90a20a217f
280 changed files with 5818 additions and 4269 deletions
--- a/db/Cargo.toml
+++ b/db/Cargo.toml
@@ -11,7 +11,7 @@ build = "build.rs"
 ethcore-ipc-codegen = { path = "../ipc/codegen" }

 [dependencies]
-clippy = { version = "0.0.96", optional = true}
+clippy = { version = "0.0.103", optional = true}
 ethcore-devtools = { path = "../devtools" }
 ethcore-ipc = { path = "../ipc/rpc" }
 rocksdb = { git = "https://github.com/ethcore/rust-rocksdb" }