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

..

generator

Backports to beta (#2068)

2016-09-11 14:04:17 +02:00

best_block.rs

Single DB (#1741)

2016-07-28 23:46:24 +02:00

block_info.rs

Backports to beta (#2068)

2016-09-11 14:04:17 +02:00

blockchain.rs

Beta Backports (#2396)

2016-09-29 13:19:53 +02:00

cache.rs

Bloomchain (#1014)

2016-05-26 18:24:51 +02:00

config.rs

cli overhaul (#1600)

2016-07-25 16:09:47 +02:00

extras.rs

Backports to beta (#2068)

2016-09-11 14:04:17 +02:00

import_route.rs

Fix spelling of "omitted"

2016-04-24 22:16:34 +01:00

mod.rs

Snapshot creation and restoration (#1679)

2016-08-05 17:00:46 +02:00

update.rs

Beta Backports (#2396)

2016-09-29 13:19:53 +02:00