Merge pull request #521 from laanwj/qt
authorGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Sep 2011 13:05:11 +0000 (06:05 -0700)
committerGavin Andresen <gavinandresen@gmail.com>
Mon, 26 Sep 2011 13:05:11 +0000 (06:05 -0700)
Qt GUI

1  2 
README.md
src/main.cpp

diff --cc README.md
Simple merge
diff --cc src/main.cpp
Simple merge