keorn 49fba0b548 Merge branch 'master' into auth-round ... Conflicts: ethcore/src/miner/miner.rs sync/Cargo.toml		2016-09-19 14:35:44 +02:00
..
external.rs	Miner tweaks (#1797)	2016-08-02 17:53:32 +01:00
miner.rs	Merge branch 'master' into auth-round	2016-09-19 14:35:44 +02:00
mod.rs	Fix several RPCs (#1926)	2016-08-17 19:25:02 +02:00
price_info.rs	Miner tests (#1597)	2016-07-14 12:16:53 +02:00
transaction_queue.rs	Bump clippy & Fix warnings (#2109)	2016-09-16 23:03:26 +02:00
work_notify.rs	Fixing some clippy warnings (#1728)	2016-07-26 20:31:25 +02:00