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

@@ -10,7 +10,7 @@ authors = ["Ethcore <admin@ethcore.io"]
[dependencies]
ethcore-util = { path = "../util" }
ethcore = { path = ".." }
clippy = { version = "0.0.42", optional = true }
clippy = { version = "0.0.44", optional = true }
log = "0.3"
env_logger = "0.3"
time = "0.1.34"
@@ -18,4 +18,4 @@ rand = "0.3.13"
[features]
default = []
dev = ["clippy", "ethcore/dev", "ethcore-util/dev"]
dev = ["clippy", "ethcore/dev", "ethcore-util/dev"]