amalraj.manigmail.com 72270b10c7 Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12 ... # Conflicts: # .travis.yml # README.md # cmd/geth/genesis_test.go # core/genesis.go # core/genesis_test.go # core/state_processor.go # eth/config.go # eth/downloader/downloader_test.go # eth/protocol_test.go # params/config.go		2018-09-27 18:55:55 +08:00
..
clique	Merge remote-tracking branch 'remotes/geth/release/1.8' into merge-193	2018-07-24 16:11:05 +08:00
ethash	merge 1.8.12 with upstream/master to apply the fixes/changes added newly	2018-08-06 19:03:51 +08:00
istanbul	Merge remote-tracking branch 'remotes/origin/master' into geth-upgrade-1.8.12	2018-09-27 18:55:55 +08:00
misc	Geth 1.7.2 rebase and addition of Istanbul BFT (#207)	2017-10-31 18:24:11 -04:00
consensus.go	Merge attempt	2018-05-31 14:16:44 +08:00
errors.go	Merge attempt	2018-05-31 14:16:44 +08:00
protocol.go	consensus, core, eth, miner, params: update istanbul engine	2018-01-31 10:27:08 +08:00