Merge branch 'master' into sfedgecase

This commit is contained in:
Gav Wood
2016-06-23 14:43:42 +02:00
17 changed files with 48 additions and 32 deletions

View File

@@ -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.76", optional = true}
clippy = { version = "0.0.77", optional = true}
json-ipc-server = { git = "https://github.com/ethcore/json-ipc-server.git" }
[build-dependencies]