Merge branch 'master' into simplified_block_opening

This commit is contained in:
debris
2016-06-13 15:11:14 +02:00
20 changed files with 157 additions and 156 deletions

View File

@@ -22,7 +22,7 @@ ethcore-util = { path = "../util" }
evmjit = { path = "../evmjit", optional = true }
ethash = { path = "../ethash" }
num_cpus = "0.2"
clippy = { version = "0.0.71", optional = true}
clippy = { version = "0.0.76", optional = true}
crossbeam = "0.2.9"
lazy_static = "0.1"
ethcore-devtools = { path = "../devtools" }