Merge pull request #2168 from sipa/txindex

author Gavin Andresen <[email protected]>

Fri, 25 Jan 2013 20:55:52 +0000 (12:55 -0800)

committer Gavin Andresen <[email protected]>

Fri, 25 Jan 2013 20:55:52 +0000 (12:55 -0800)
author Gavin Andresen <[email protected]>
Fri, 25 Jan 2013 20:55:52 +0000 (12:55 -0800)
committer Gavin Andresen <[email protected]>
Fri, 25 Jan 2013 20:55:52 +0000 (12:55 -0800)
diff --cc src/init.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
author	Gavin Andresen <[email protected]>
	Fri, 25 Jan 2013 20:55:52 +0000 (12:55 -0800)
committer	Gavin Andresen <[email protected]>
	Fri, 25 Jan 2013 20:55:52 +0000 (12:55 -0800)
		1	2
src/init.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history