Tomasz Drwięga 8b84b4f128 Merge branch 'master' into rpc-shared-miner ... Conflicts: parity/main.rs		2016-04-22 12:16:15 +02:00
..
src	Merge branch 'master' into rpc-shared-miner	2016-04-22 12:16:15 +02:00
Cargo.toml	Bumping clippy version	2016-04-12 13:51:39 +02:00
build.rs	Adding clippy support to ethminer.	2016-03-10 12:33:29 +01:00