Nikolay Volf 6c6bbe9c57 Merge branch 'master' into miner-spec-refact ... Conflicts: ethcore/src/client/client.rs ethcore/src/client/mod.rs ethcore/src/client/test_client.rs miner/src/miner.rs		2016-05-19 03:51:05 +03:00
..
src	Merge branch 'master' into miner-spec-refact	2016-05-19 03:51:05 +03:00
Cargo.toml	Bumping clippy & crossbeam	2016-05-17 09:33:01 +02:00
cov.sh	excluded test code from coverage	2016-02-05 02:01:29 +03:00