Merge branch 'master' into mining

2016-03-02 08:54:21 +03:00 · 2016-03-02 08:54:21 +03:00 · 6b9fde5790
commit 6b9fde5790
parent d55aa54412 cda48e3ce8
1 changed files with 1 additions and 1 deletions
--- a/ethcore/src/blockchain/helpers/generators.rs
+++ b/ethcore/src/blockchain/helpers/generators.rs
@ -16,7 +16,7 @@

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