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

2016-02-20 00:48:36 +01:00
parent e64d3daa06 b66f88181a
commit 00f2c6e3e4
26 changed files with 1951 additions and 714 deletions
--- a/util/src/lib.rs
+++ b/util/src/lib.rs
@@ -106,6 +106,7 @@ extern crate serde;
 #[macro_use]
 extern crate log as rlog;
 extern crate igd;
+extern crate libc;

 pub mod standard;
 #[macro_use]