Tomasz Drwięga 92022ac14d Merge branch 'master' into ethminer_crate ...

Conflicts:
	ethcore/src/client.rs
	parity/main.rs
	rpc/src/v1/impls/eth.rs
	sync/src/chain.rs

2016-03-10 16:38:58 +01:00

..

tests

Merge branch 'master' into ethminer_crate

2016-03-10 16:38:58 +01:00

chain.rs

Merge branch 'master' into ethminer_crate

2016-03-10 16:38:58 +01:00

io.rs

added license in every *.rs file

2016-02-05 13:40:41 +01:00

lib.rs

Merge branch 'master' into ethminer_crate

2016-03-10 16:38:58 +01:00

range_collection.rs

Merge pull request #627 from ethcore/clippy-dev

2016-03-10 11:05:56 +01:00