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

..

src

Merge branch 'master' into miner-no-default

2016-06-26 22:44:34 +02:00

Cargo.toml

v1.3.0 (#1421)

2016-06-25 10:32:05 +02:00

cov.sh

excluded test code from coverage

2016-02-05 02:01:29 +03:00