Tomasz Drwięga fadbc61dff Merge branch 'ethminer_crate' into rpc_pending_filter ... Conflicts: miner/src/miner.rs parity/main.rs		2016-03-11 19:27:09 +01:00
..
src	Merge branch 'ethminer_crate' into rpc_pending_filter	2016-03-11 19:27:09 +01:00
build.rs	Removing superflous check for nightly	2016-03-11 11:16:49 +01:00
Cargo.toml	Merge branch 'master' into ethminer_crate	2016-03-11 14:37:07 +01:00