keorn 1f56588b87 Merge remote-tracking branch 'parity/master' into bft ...

Conflicts:
	ethcore/src/client/client.rs

2016-10-05 14:57:14 +01:00

..

src

Merge remote-tracking branch 'parity/master' into bft

2016-10-05 14:57:14 +01:00

build.rs

drying sync

2016-08-01 19:55:38 +02:00

Cargo.toml

derive -> ipc

2016-10-04 19:20:16 +03:00

cov.sh

excluded test code from coverage

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