Merge branch 'master' into mining

This commit is contained in:
Nikolay Volf 2016-03-02 08:54:21 +03:00
commit 6b9fde5790

View File

@ -16,7 +16,7 @@
use util::rlp::*; use util::rlp::*;
use util::hash::{H256, H2048}; use util::hash::{H256, H2048};
use util::uint::{U256}; use util::numbers::{U256};
use util::bytes::Bytes; use util::bytes::Bytes;
use header::{BlockNumber, Header}; use header::{BlockNumber, Header};
use transaction::SignedTransaction; use transaction::SignedTransaction;