Tomasz Drwięga 8b84b4f128 Merge branch 'master' into rpc-shared-miner ...

Conflicts:
	parity/main.rs

2016-04-22 12:16:15 +02:00

..

external.rs

Shared instance of ExternalMiner

2016-04-21 17:32:53 +02:00

lib.rs

Shared instance of ExternalMiner

2016-04-21 17:32:53 +02:00

miner.rs

Compilation fix

2016-04-21 20:53:44 +02:00

transaction_queue.rs

Fixing warnings

2016-04-21 16:06:54 +02:00