openethereum/ethcore
Tomasz Drwięga c3a79c1478 Merge branch 'master' into ethminer_crate
Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
2016-03-11 19:22:40 +01:00
..
res Update tests. Fix our tests. 2016-03-01 20:02:59 +01:00
src Merge branch 'master' into ethminer_crate 2016-03-11 19:22:40 +01:00
Cargo.toml Removing superflous check for nightly 2016-03-11 11:16:49 +01:00