obscuren f0b2ea64fc Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs ...

Conflicts:
	eth/block_pool.go
	eth/block_pool_test.go
	eth/protocol_test.go
	miner/worker.go

2015-03-03 20:30:05 +01:00

..

backend.go

Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs

2015-03-03 20:30:05 +01:00

peer_util.go

made mist in a compilable, workable state using the new refactored packages

2014-12-15 13:00:29 +01:00

protocol_test.go

Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs

2015-03-03 20:30:05 +01:00

protocol.go

Merge branch 'jsonlogs' of https://github.com/ethersphere/go-ethereum into ethersphere-jsonlogs

2015-03-03 20:30:05 +01:00

wallet.go

BlockManager => BlockProcessor

2015-01-05 00:18:44 +01:00