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
..
src	Merge remote-tracking branch 'parity/master' into bft	2016-09-30 12:44:52 +01:00
build.rs	Getting rid of syntex	2016-08-19 14:26:03 +02:00
Cargo.toml	Bump clippy & Fix warnings (#2109)	2016-09-16 23:03:26 +02:00