Tomasz Drwięga 6bbaced3cd Merge branch 'master' into miner-no-default ... Conflicts: ethcore/src/miner/miner.rs parity/main.rs		2016-06-26 22:44:34 +02:00
..
res	Add missing args and some new JSONs for testing.	2016-06-19 14:49:06 +02:00
src	Merge branch 'master' into miner-no-default	2016-06-26 22:44:34 +02:00
build.rs	Moving all Client public API types to separate mod & binary serialization codegen for that mod (#1051)	2016-05-16 18:33:32 +02:00
Cargo.toml	v1.3.0 (#1421)	2016-06-25 10:32:05 +02:00