Merge pull request #2827 from Diapolo/rpccon_winpos

author Gavin Andresen <[email protected]>

Mon, 5 Aug 2013 07:58:05 +0000 (00:58 -0700)

committer Gavin Andresen <[email protected]>

Mon, 5 Aug 2013 07:58:05 +0000 (00:58 -0700)
author Gavin Andresen <[email protected]>
Mon, 5 Aug 2013 07:58:05 +0000 (00:58 -0700)
committer Gavin Andresen <[email protected]>
Mon, 5 Aug 2013 07:58:05 +0000 (00:58 -0700)
diff --cc src/qt/bitcoingui.cpp
Simple merge
diff --cc src/qt/guiutil.cpp
Simple merge
author	Gavin Andresen <[email protected]>
	Mon, 5 Aug 2013 07:58:05 +0000 (00:58 -0700)
committer	Gavin Andresen <[email protected]>
	Mon, 5 Aug 2013 07:58:05 +0000 (00:58 -0700)
		1	2
src/qt/bitcoingui.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/qt/guiutil.cpp	patch \|	diff1 \|	diff2 \|	blob \| history