Merge branch 'addrman' of https://github.com/sipa/bitcoin

2012-03-22 09:19:01 -04:00
parent 0e894be626 5fee401fe1
commit a6b4a11385
17 changed files with 1180 additions and 249 deletions
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -101,6 +101,7 @@ HEADERS += src/qt/bitcoingui.h \
    src/qt/aboutdialog.h \
    src/qt/editaddressdialog.h \
    src/qt/bitcoinaddressvalidator.h \
+    src/addrman.h \
    src/base58.h \
    src/bignum.h \
    src/checkpoints.h \
@@ -175,6 +176,7 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
    src/net.cpp \
    src/irc.cpp \
    src/checkpoints.cpp \
+    src/addrman.cpp \
    src/db.cpp \
    src/json/json_spirit_writer.cpp \
    src/json/json_spirit_value.cpp \