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

2016-05-08 13:34:14 +01:00
parent 04f7322f06 f5e44e373e
commit c75348392c
12 changed files with 107 additions and 142 deletions
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -40,8 +40,6 @@ extern crate rpassword;
 extern crate semver;
 extern crate ethcore_ipc as ipc;
 extern crate ethcore_ipc_nano as nanoipc;
-extern crate serde;
-extern crate bincode;
 #[macro_use]
 extern crate hyper; // for price_info.rs
 extern crate json_ipc_server as jsonipc;