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

Conflicts:
	ethcore/src/client/client.rs

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

..

res

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

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

Snapshot sync (#2047)

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

Cargo.toml

Better EVM informant & Slow transactions warning (#2436)

2016-10-03 23:29:46 +02:00