Auto merge of #1567 - str4d:rename-binaries, r=daira

author zkbot <[email protected]>

Sat, 22 Oct 2016 00:48:11 +0000 (20:48 -0400)

committer zkbot <[email protected]>

Sat, 22 Oct 2016 00:48:11 +0000 (20:48 -0400)
author zkbot <[email protected]>
Sat, 22 Oct 2016 00:48:11 +0000 (20:48 -0400)
committer zkbot <[email protected]>
Sat, 22 Oct 2016 00:48:11 +0000 (20:48 -0400)
diff --cc .gitignore
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/Makefile.gtest.include
Simple merge
diff --cc src/bitcoin-tx.cpp
Simple merge
author	zkbot <[email protected]>
	Sat, 22 Oct 2016 00:48:11 +0000 (20:48 -0400)
committer	zkbot <[email protected]>
	Sat, 22 Oct 2016 00:48:11 +0000 (20:48 -0400)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.gtest.include	patch \|	diff1 \|	diff2 \|	blob \| history
src/bitcoin-tx.cpp	patch \|	diff1 \|	diff2 \|	blob \| history