Merge pull request #2526 from Diapolo/Qt_misc

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

Tue, 23 Apr 2013 16:27:30 +0000 (09:27 -0700)

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

Tue, 23 Apr 2013 16:27:30 +0000 (09:27 -0700)
author Wladimir J. van der Laan <[email protected]>
Tue, 23 Apr 2013 16:27:30 +0000 (09:27 -0700)
committer Wladimir J. van der Laan <[email protected]>
Tue, 23 Apr 2013 16:27:30 +0000 (09:27 -0700)
diff --cc src/qt/bitcoin.cpp
Simple merge
diff --cc src/qt/bitcoingui.cpp
Simple merge
author	Wladimir J. van der Laan <[email protected]>
	Tue, 23 Apr 2013 16:27:30 +0000 (09:27 -0700)
committer	Wladimir J. van der Laan <[email protected]>
	Tue, 23 Apr 2013 16:27:30 +0000 (09:27 -0700)
		1	2
src/qt/bitcoin.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/qt/bitcoingui.cpp	patch \|	diff1 \|	diff2 \|	blob \| history