Merge branch 'testnet_alert' of git://github.com/gavinandresen/bitcoin-git

2012-09-05 11:38:38 -04:00
parent 21327ebe93 286dbba2d2
commit 91c218a1cb
10 changed files with 351 additions and 293 deletions
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -119,6 +119,7 @@ HEADERS += src/qt/bitcoingui.h \
    src/qt/aboutdialog.h \
    src/qt/editaddressdialog.h \
    src/qt/bitcoinaddressvalidator.h \
+    src/alert.h \
    src/addrman.h \
    src/base58.h \
    src/bignum.h \
@@ -189,6 +190,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
    src/qt/aboutdialog.cpp \
    src/qt/editaddressdialog.cpp \
    src/qt/bitcoinaddressvalidator.cpp \
+    src/alert.cpp \
    src/version.cpp \
    src/sync.cpp \
    src/util.cpp \