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/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -56,6 +56,7 @@ LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l w
 HEADERS = $(wildcard *.h)

 OBJS= \
+    obj/alert.o \
    obj/version.o \
    obj/checkpoints.o \
    obj/netbase.o \