Tomasz Drwięga f8dd1a6354 Merge branch 'master' into tx_queue_timeout ...

Conflicts:
	ethcore/src/client/test_client.rs
	miner/src/miner.rs

2016-03-18 19:36:32 +01:00

..

res

Update tests. Fix our tests.

2016-03-01 20:02:59 +01:00

src

Merge branch 'master' into tx_queue_timeout

2016-03-18 19:36:32 +01:00

Cargo.toml

Bumping clippy

2016-03-18 10:08:47 +01:00