Merge pull request #1054 from sipa/buildinfo

author Pieter Wuille <pieter.wuille@gmail.com>

Tue, 10 Apr 2012 20:31:12 +0000 (13:31 -0700)

committer Pieter Wuille <pieter.wuille@gmail.com>

Tue, 10 Apr 2012 20:31:12 +0000 (13:31 -0700)
author Pieter Wuille <pieter.wuille@gmail.com>
Tue, 10 Apr 2012 20:31:12 +0000 (13:31 -0700)
committer Pieter Wuille <pieter.wuille@gmail.com>
Tue, 10 Apr 2012 20:31:12 +0000 (13:31 -0700)
diff --cc src/init.cpp
Simple merge
diff --cc src/main.cpp
Simple merge
diff --cc src/util.cpp
Simple merge
author	Pieter Wuille <pieter.wuille@gmail.com>
	Tue, 10 Apr 2012 20:31:12 +0000 (13:31 -0700)
committer	Pieter Wuille <pieter.wuille@gmail.com>
	Tue, 10 Apr 2012 20:31:12 +0000 (13:31 -0700)
		1	2
src/init.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/main.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/util.cpp	patch \|	diff1 \|	diff2 \|	blob \| history