Jeffrey Wilcke a8ebf756c7 Merge branch 'miner-broadcast' into core-optimisations-2 ... Conflicts: core/chain_manager.go miner/worker.go		2015-06-29 18:55:49 +02:00
..
agent.go	core/types: make blocks immutable	2015-06-29 18:51:47 +02:00
miner.go	core, miner: tx pool drops txs below ask price	2015-06-15 11:33:08 +02:00
remote_agent.go	core/types: make blocks immutable	2015-06-29 18:51:47 +02:00
worker.go	Merge branch 'miner-broadcast' into core-optimisations-2	2015-06-29 18:55:49 +02:00