Gav Wood dcb23de65c Merge pull request #771 from ethcore/tx_queue_timeout ... Disable preparing work package if miners don't ask for it.		2016-03-20 16:29:13 +01:00
..
res	fixed invalid json files	2016-03-18 23:56:51 +01:00
src	Merge pull request #771 from ethcore/tx_queue_timeout	2016-03-20 16:29:13 +01:00
Cargo.toml	Merge branch 'master' of github.com:ethcore/parity into ethrpc_test	2016-03-18 18:05:29 +01:00