Auto merge of #1870 - str4d:1749-benchmark-rescanning, r=str4d

author zkbot <[email protected]>

Fri, 9 Dec 2016 07:12:22 +0000 (07:12 +0000)

committer zkbot <[email protected]>

Fri, 9 Dec 2016 07:12:22 +0000 (07:12 +0000)
author zkbot <[email protected]>
Fri, 9 Dec 2016 07:12:22 +0000 (07:12 +0000)
committer zkbot <[email protected]>
Fri, 9 Dec 2016 07:12:22 +0000 (07:12 +0000)
diff --cc src/Makefile.gtest.include
Simple merge
diff --cc src/wallet/rpcwallet.cpp
Simple merge
diff --cc src/zcbenchmarks.cpp
Simple merge
author	zkbot <[email protected]>
	Fri, 9 Dec 2016 07:12:22 +0000 (07:12 +0000)
committer	zkbot <[email protected]>
	Fri, 9 Dec 2016 07:12:22 +0000 (07:12 +0000)
		1	2
src/Makefile.gtest.include	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/rpcwallet.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/zcbenchmarks.cpp	patch \|	diff1 \|	diff2 \|	blob \| history