keorn 0c69d4a1ce Merge remote-tracking branch 'parity/master' into auth-round ...

Conflicts:
	devtools/src/random_path.rs

2016-09-27 12:39:25 +02:00

..

authority_round.rs

reseal on timeout

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

basic_authority.rs

Enable sealing if Engine provides internal sealing given author (#2084)

2016-09-15 12:12:15 +02:00

instant_seal.rs

Enable sealing if Engine provides internal sealing given author (#2084)

2016-09-15 12:12:15 +02:00

mod.rs

Merge remote-tracking branch 'parity/master' into auth-round

2016-09-27 12:39:25 +02:00

null_engine.rs

ethkey and ethstore use hash structures from bigint (#1851)

2016-08-15 15:09:00 +02:00