Merge remote-tracking branch 'jl/dev' into momo

author Scott Sadler <[email protected]>

Sat, 2 Jun 2018 19:13:53 +0000 (16:13 -0300)

committer Scott Sadler <[email protected]>

Sat, 2 Jun 2018 19:13:53 +0000 (16:13 -0300)
author Scott Sadler <[email protected]>
Sat, 2 Jun 2018 19:13:53 +0000 (16:13 -0300)
committer Scott Sadler <[email protected]>
Sat, 2 Jun 2018 19:13:53 +0000 (16:13 -0300)
diff --cc src/komodo_bitcoind.h
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/miner.cpp
Simple merge
author	Scott Sadler <[email protected]>
	Sat, 2 Jun 2018 19:13:53 +0000 (16:13 -0300)
committer	Scott Sadler <[email protected]>
	Sat, 2 Jun 2018 19:13:53 +0000 (16:13 -0300)
		1	2
src/komodo_bitcoind.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/miner.cpp	patch \|	diff1 \|	diff2 \|	blob \| history