openethereum/ethcore
Tomasz Drwięga 03da6c991f Merge branch 'master' into ethminer_crate
Conflicts:
	Cargo.lock
	Cargo.toml
	ethcore/src/client/client.rs
	hook.sh
	parity/main.rs
	rpc/Cargo.toml
	rpc/src/v1/impls/eth.rs
	sync/Cargo.toml
	sync/src/tests/helpers.rs
2016-03-11 14:37:07 +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 14:37:07 +01:00
Cargo.toml Removing superflous check for nightly 2016-03-11 11:16:49 +01:00