Tomusdrw 94f23ac5ba Merge branch 'gav' into evm+gav ... Conflicts: src/ethereum/ethash.rs		2016-01-17 01:18:35 +01:00
..
ethereum	Merge branch 'gav' into evm+gav	2016-01-17 01:18:35 +01:00
null_morden.json	Spec name; uncle reward calculation fixed	2016-01-15 01:17:23 +01:00