Merge branch 'master' into jsonrpc2

This commit is contained in:
debris
2016-02-23 14:53:09 +01:00
18 changed files with 99 additions and 97 deletions

View File

@@ -16,7 +16,7 @@ jsonrpc-http-server = "1.1"
ethcore-util = { path = "../util" }
ethcore = { path = "../ethcore" }
ethsync = { path = "../sync" }
clippy = { version = "0.0.42", optional = true }
clippy = { version = "0.0.44", optional = true }
rustc-serialize = "0.3"
serde_macros = { version = "0.6.13", optional = true }