Merge branch 'master' into temp-path

Conflicts: util/Cargo.toml util/src/lib.rs
2016-02-19 19:11:24 +03:00
parent ab0fe65f3f 6518576a3f
commit 84e7ce2758
25 changed files with 1914 additions and 693 deletions
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@@ -106,8 +106,8 @@ extern crate serde;
 #[macro_use]
 extern crate log as rlog;
 extern crate igd;
-#[cfg(test)]
 extern crate ethcore_devtools as devtools;
+extern crate libc;

 pub mod standard;
 #[macro_use]