keorn 9ca938f740 Merge remote-tracking branch 'parity/master' into bft ...

Conflicts:
	ethcore/src/client/client.rs
	sync/src/api.rs

2016-09-30 12:44:52 +01:00

..

res

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

2016-09-30 12:44:52 +01:00

src

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

2016-09-30 12:44:52 +01:00

build.rs

Snapshot sync (#2047)

2016-09-06 15:31:13 +02:00

Cargo.toml

Canonical state cache (master) (#2311)

2016-09-27 18:02:11 +02:00