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
..
src	Removing update_seal when new transactions arrives	2016-03-17 18:30:26 +01:00
build.rs	Removing superflous check for nightly	2016-03-11 11:16:49 +01:00
Cargo.toml	Bumping clippy	2016-03-18 10:08:47 +01:00