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)
commitf246fc648a26115587ae51090bde48b92c3a6a3b
tree110b138fb94196b34e7e89e2a117b7eaff184e52
parent0d56f11ada27d8fa60c8f5179917a7c9de4a8c4b
parent303a47c09592c33aa84e2264e69643ef2570fa76
Merge branch '201202_guiaddsuffix' of https://github.com/laanwj/bitcoin
src/qt/guiutil.cpp
src/qt/guiutil.h