Merge branch 'master' of github.com:ethcore/parity into jsonrpc2

2016-02-22 08:50:03 +01:00
parent 8db8e5b5f8 aedc65dbbf
commit 155404bf92
52 changed files with 2298 additions and 874 deletions
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -92,6 +92,7 @@ extern crate env_logger;
 extern crate num_cpus;
 extern crate crossbeam;

+#[cfg(test)] extern crate ethcore_devtools as devtools;
 #[cfg(feature = "jit" )] extern crate evmjit;

 pub mod block;