Tomasz Drwięga c3a79c1478 Merge branch 'master' into ethminer_crate ... Conflicts: ethcore/src/client/client.rs parity/main.rs sync/src/chain.rs sync/src/lib.rs		2016-03-11 19:22:40 +01:00
..
client.rs	Adding transactions to block	2016-03-09 13:09:34 +01:00
helpers.rs	Fixups for new API.	2016-03-11 15:07:43 +01:00
mod.rs	returning client to the place it should be, cleanup	2016-02-09 00:54:33 +03:00