Tomasz Drwięga 9c92d601b1 Merge branch 'master' into ethminer_crate ...

Conflicts:
	rpc/src/v1/impls/eth.rs

2016-03-11 15:56:30 +01:00

..

src

Merge branch 'master' into ethminer_crate

2016-03-11 15:56:30 +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