Merge pull request #857 from laanwj/2012_02_fixhelpwindow

author Wladimir J. van der Laan <[email protected]>

Mon, 20 Feb 2012 16:56:41 +0000 (08:56 -0800)

committer Wladimir J. van der Laan <[email protected]>

Mon, 20 Feb 2012 16:56:41 +0000 (08:56 -0800)
author Wladimir J. van der Laan <[email protected]>
Mon, 20 Feb 2012 16:56:41 +0000 (08:56 -0800)
committer Wladimir J. van der Laan <[email protected]>
Mon, 20 Feb 2012 16:56:41 +0000 (08:56 -0800)
diff --cc src/init.cpp
Simple merge
diff --cc src/qt/bitcoin.cpp
Simple merge
author	Wladimir J. van der Laan <[email protected]>
	Mon, 20 Feb 2012 16:56:41 +0000 (08:56 -0800)
committer	Wladimir J. van der Laan <[email protected]>
	Mon, 20 Feb 2012 16:56:41 +0000 (08:56 -0800)
		1	2
src/init.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoin.cpp	patch \|	diff1 \|	diff2 \|	blob \| history