Tomasz Drwięga 63d3a4dd59 Beta Backports (#2396) ... * Removing extras data from retracted blocks. (#2375) * Removing extras data from retracted blocks. * Adding a test case Conflicts: ethcore/src/blockchain/blockchain.rs * Fixing transaction queue Conflicts: ethcore/src/miner/transaction_queue.rs * Prioritizing re-imported transactions (#2372) * Prioritizing re-imported transactions * Fixing compilation on beta Conflicts: Cargo.lock ethcore/src/client/client.rs ethcore/src/miner/transaction_queue.rs * Post-merge fixes		2016-09-29 13:19:53 +02:00
..
res	Backports to beta (#2068)	2016-09-11 14:04:17 +02:00
src	Beta Backports (#2396)	2016-09-29 13:19:53 +02:00
Cargo.toml	Accounts bloom (#2357)	2016-09-29 11:27:41 +02:00
build.rs	drying hypervisor	2016-08-01 19:53:53 +02:00