Tomasz Drwięga 3ea52c2324 Merge branch 'master' into ethminer_crate ...

Conflicts:
	parity/main.rs

2016-03-12 10:22:43 +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-12 10:22:43 +01:00

Cargo.toml

Merge branch 'master' into updating_clippy

2016-03-11 19:17:09 +01:00