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/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -4,6 +4,7 @@
 #include "addresstablemodel.h"
 #include "transactiontablemodel.h"

+#include "alert.h"
 #include "main.h"
 #include "ui_interface.h"