Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoin
authorGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 15:41:11 +0000 (10:41 -0500)
committerGavin Andresen <gavinandresen@gmail.com>
Wed, 22 Feb 2012 15:41:11 +0000 (10:41 -0500)
1  2 
src/qt/guiutil.cpp
src/qt/guiutil.h

Simple merge
Simple merge