Tomasz Drwięga 6bbaced3cd Merge branch 'master' into miner-no-default ... Conflicts: ethcore/src/miner/miner.rs parity/main.rs		2016-06-26 22:44:34 +02:00
..
tests	Reduce locking	2016-06-20 17:28:48 +02:00
blocks.rs	Sync optimization (#1385)	2016-06-22 12:10:26 +02:00
chain.rs	Update highest block progress	2016-06-23 22:40:44 +02:00
io.rs	Check for session expiration on peer registration	2016-06-17 16:01:33 +02:00
lib.rs	Fixing sync doctests	2016-06-24 12:41:48 +02:00