Merge branch 'vmtracing' into diffing

2016-06-02 12:28:09 +02:00
parent 5c63311268 d40a038f37
commit bc5c3da2af
93 changed files with 2826 additions and 1597 deletions
--- a/ethcore/src/lib.rs
+++ b/ethcore/src/lib.rs
@@ -90,6 +90,7 @@ extern crate crossbeam;
 extern crate ethjson;
 extern crate bloomchain;
 #[macro_use] extern crate ethcore_ipc as ipc;
+extern crate rayon;

 #[cfg(test)] extern crate ethcore_devtools as devtools;
 #[cfg(feature = "jit" )] extern crate evmjit;
@@ -109,6 +110,7 @@ pub mod views;
 pub mod pod_state;
 pub mod engine;
 pub mod migrations;
+pub mod miner;

 mod blooms;
 mod db;